Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[3898] XoopsCore/trunk/htdocs
|
From: <tr...@us...> - 2009-11-17 20:41:55
|
Revision: 3898
http://xoops.svn.sourceforge.net/xoops/?rev=3898&view=rev
Author: trabis
Date: 2009-11-17 20:41:44 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
Fixing bug - notification duplication and other problems that arose with the removal of & operator for php5.3 compatibility.
Modified Paths:
--------------
XoopsCore/trunk/htdocs/class/cache/memcache.php
XoopsCore/trunk/htdocs/class/database/databasefactory.php
XoopsCore/trunk/htdocs/class/module.textsanitizer.php
XoopsCore/trunk/htdocs/class/template.php
XoopsCore/trunk/htdocs/class/theme.php
XoopsCore/trunk/htdocs/class/theme_blocks.php
XoopsCore/trunk/htdocs/header.php
XoopsCore/trunk/htdocs/include/functions.php
XoopsCore/trunk/htdocs/include/site-closed.php
XoopsCore/trunk/htdocs/kernel/object.php
XoopsCore/trunk/htdocs/modules/system/class/cpanel.php
Property Changed:
----------------
XoopsCore/trunk/htdocs/cache/
Property changes on: XoopsCore/trunk/htdocs/cache
___________________________________________________________________
Added: svn:ignore
+ fckconfig.news.js
Modified: XoopsCore/trunk/htdocs/class/cache/memcache.php
===================================================================
--- XoopsCore/trunk/htdocs/class/cache/memcache.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/cache/memcache.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -101,6 +101,7 @@
$this->settings['servers'] = array(
$this->settings['servers']);
}
+ $this->memcache = null;
$this->memcache = new Memcache();
foreach ($this->settings['servers'] as $server) {
$parts = explode(':', $server);
Modified: XoopsCore/trunk/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/trunk/htdocs/class/database/databasefactory.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/database/databasefactory.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -65,7 +65,7 @@
$xoopsPreload =& XoopsPreload::getInstance();
$xoopsPreload->triggerEvent('core.class.database.databasefactory.connection', array(&$class));
-
+ unset($instance);
$instance = new $class();
$instance->setLogger(XoopsLogger::getInstance());
$instance->setPrefix(XOOPS_DB_PREFIX);
@@ -98,6 +98,7 @@
} else {
$class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
}
+ unset($database);
$database = new $class();
} else {
trigger_error('notrace:Failed to load database of type: ' . XOOPS_DB_TYPE . ' in file: ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
Modified: XoopsCore/trunk/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/trunk/htdocs/class/module.textsanitizer.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/module.textsanitizer.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -642,6 +642,7 @@
trigger_error('Extension ' . $name . ' not exist', E_USER_WARNING);
return false;
}
+ $extension = null;
$extension = new $class($this);
return $extension;
}
Modified: XoopsCore/trunk/htdocs/class/template.php
===================================================================
--- XoopsCore/trunk/htdocs/class/template.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/template.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package kernel
- * @subpackage Xoop Forms class
+ * @subpackage core
* @since 2.3.0
* @author Kazumi Ono <on...@xo...>
* @author Skalpa Keo <sk...@xo...>
Modified: XoopsCore/trunk/htdocs/class/theme.php
===================================================================
--- XoopsCore/trunk/htdocs/class/theme.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/theme.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package kernel
- * @subpackage Xoop Forms class
+ * @subpackage core
* @since 2.3.0
* @author Skalpa Keo <sk...@xo...>
* @author Taiwen Jiang <ph...@us...>
@@ -74,6 +74,7 @@
$GLOBALS['xoopsConfig']['theme_set'] = $options['folderName'];
}
$options['path'] = XOOPS_THEME_PATH . '/' . $options['folderName'];
+ $inst = null;
$inst = new xos_opal_Theme();
foreach ($options as $k => $v) {
$inst->$k = $v;
@@ -260,7 +261,7 @@
{
$this->path = XOOPS_THEME_PATH . '/' . $this->folderName;
$this->url = XOOPS_THEME_URL . '/' . $this->folderName;
-
+ $this->template = null;
$this->template = new XoopsTpl();
$this->template->currentTheme =& $this;
$this->template->assign_by_ref('xoTheme', $this);
@@ -313,6 +314,7 @@
// Instanciate and initialize all the theme plugins
foreach ($this->plugins as $k => $bundleId) {
if (!is_object($bundleId)) {
+ $this->plugins[$bundleId] = null;
$this->plugins[$bundleId] = new $bundleId();
$this->plugins[$bundleId]->theme =& $this;
$this->plugins[$bundleId]->xoInit();
Modified: XoopsCore/trunk/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/trunk/htdocs/class/theme_blocks.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/class/theme_blocks.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -15,7 +15,7 @@
* @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
* @license http://www.fsf.org/copyleft/gpl.html GNU public license
* @package kernel
- * @subpackage Xoop Forms class
+ * @subpackage core
* @since 2.3.0
* @author Skalpa Keo <sk...@xo...>
* @author John Neill <cat...@xo...>
@@ -87,7 +87,7 @@
list ($mid, $dirname) = array(
0 ,
'system');
- $isStart = ! empty($GLOBALS['xoopsOption']['show_cblock']);
+ $isStart = !empty($GLOBALS['xoopsOption']['show_cblock']);
}
$groups = (isset($GLOBALS['xoopsUser']) && is_object($GLOBALS['xoopsUser'])) ? $GLOBALS['xoopsUser']->getGroups() : array(
@@ -106,11 +106,12 @@
$this->blocks[$zone] = array();
}
if ($this->theme) {
- $template = &$this->theme->template;
+ $template =& $this->theme->template;
$backup = array(
$template->caching ,
$template->cache_lifetime);
} else {
+ $template = null;
$template = new XoopsTpl();
}
$xoopsblock = new XoopsBlock();
Modified: XoopsCore/trunk/htdocs/header.php
===================================================================
--- XoopsCore/trunk/htdocs/header.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/header.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -53,6 +53,7 @@
}
}
+ $xoopsThemeFactory = null;
$xoopsThemeFactory = new xos_opal_ThemeFactory();
$xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
$xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set'];
Modified: XoopsCore/trunk/htdocs/include/functions.php
===================================================================
--- XoopsCore/trunk/htdocs/include/functions.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/include/functions.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -443,14 +443,14 @@
if (stristr($imageurl, '.swf')) {
$bannerobject = $bannerobject
. '<div id ="xo-fixbanner">'
- . '<a href="' . XOOPS_URL . '/banners.php?op=click&bid=' . $bid . '" rel="external" title="' .$clickurl. '"></a></div>'
- . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="position:absolute; z-index:100;">'
+ . '<a href="' . XOOPS_URL . '/banners.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"></a></div>'
+ . '<object type="application/x-shockwave-flash" width="468" height="60" data="' . $imageurl . '" style="position:absolute; z-index:100;">'
. '<param name="movie" value="' . $imageurl . '" />'
- . '<param name="wmode" value="opaque" />'
+ . '<param name="wmode" value="opaque" />'
. '</object>';
} else {
- $bannerobject = $bannerobject . '<a href="' . XOOPS_URL . '/banners.php?op=click&bid=' . $bid . '" rel="external" title="' .$clickurl. '"><img src="' . $imageurl . '" alt="' .$clickurl. '" /></a>';
+ $bannerobject = $bannerobject . '<a href="' . XOOPS_URL . '/banners.php?op=click&bid=' . $bid . '" rel="external" title="' . $clickurl . '"><img src="' . $imageurl . '" alt="' . $clickurl . '" /></a>';
}
$bannerobject = $bannerobject . '</div>';
@@ -488,6 +488,7 @@
require_once XOOPS_ROOT_PATH . '/class/template.php';
require_once XOOPS_ROOT_PATH . '/class/theme.php';
+ $xoopsThemeFactory = null;
$xoopsThemeFactory = new xos_opal_ThemeFactory();
$xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
$xoopsThemeFactory->defaultTheme = $theme;
@@ -605,7 +606,7 @@
} else if (file_exists($file = XOOPS_ROOT_PATH . '/language/english/xoopsmailerlocal.php')) {
include_once $file;
}
-
+ unset($mailer);
if (class_exists('XoopsMailerLocal')) {
$mailer = new XoopsMailerLocal();
} else {
Modified: XoopsCore/trunk/htdocs/include/site-closed.php
===================================================================
--- XoopsCore/trunk/htdocs/include/site-closed.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/include/site-closed.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -43,7 +43,7 @@
if (!$allowed) {
require_once $GLOBALS['xoops']->path('class/template.php');
require_once $GLOBALS['xoops']->path('class/theme.php');
-
+ $xoopsThemeFactory = null;
$xoopsThemeFactory = new xos_opal_ThemeFactory();
$xoopsThemeFactory->allowedThemes = $xoopsConfig['theme_set_allowed'];
$xoopsThemeFactory->defaultTheme = $xoopsConfig['theme_set'];
Modified: XoopsCore/trunk/htdocs/kernel/object.php
===================================================================
--- XoopsCore/trunk/htdocs/kernel/object.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/kernel/object.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -731,6 +731,7 @@
function &xoopsClone()
{
$class = get_class($this);
+ $clone = null;
$clone = new $class();
foreach ($this->vars as $k => $v) {
$clone->assignVar($k, $v['value']);
Modified: XoopsCore/trunk/htdocs/modules/system/class/cpanel.php
===================================================================
--- XoopsCore/trunk/htdocs/modules/system/class/cpanel.php 2009-11-15 18:26:49 UTC (rev 3897)
+++ XoopsCore/trunk/htdocs/modules/system/class/cpanel.php 2009-11-17 20:41:44 UTC (rev 3898)
@@ -77,6 +77,7 @@
}
if (class_exists($class)) {
if (call_user_func(array($class , 'validate'))) {
+ $this->gui = null;
$this->gui = new $class();
$this->gui->foldername = $gui;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|