Revision: 10058
http://xoops.svn.sourceforge.net/xoops/?rev=10058&view=rev
Author: beckmi
Date: 2012-08-11 15:08:18 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Fixing issues with static functions in Installer
Modified Paths:
--------------
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/database/databasefactory.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/module.textsanitizer.php
XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/functions.php
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/database/databasefactory.php 2012-08-11 14:32:53 UTC (rev 10057)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/database/databasefactory.php 2012-08-11 15:08:18 UTC (rev 10058)
@@ -80,7 +80,7 @@
* @staticvar object The only instance of database class
* @return object Reference to the only instance of database class
*/
- function &getDatabase()
+ static function getDatabase()
{
static $database;
if (!isset($database)) {
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/module.textsanitizer.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/module.textsanitizer.php 2012-08-11 14:32:53 UTC (rev 10057)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/class/module.textsanitizer.php 2012-08-11 15:08:18 UTC (rev 10058)
@@ -233,7 +233,7 @@
* @static
* @staticvar object
*/
- function &getInstance()
+ static function getInstance()
{
static $instance;
if (!isset($instance)) {
Modified: XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/functions.php
===================================================================
--- XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/functions.php 2012-08-11 14:32:53 UTC (rev 10057)
+++ XoopsCore/branches/tasks/2.5.6_PHP5.4_mamba/htdocs/install/include/functions.php 2012-08-11 15:08:18 UTC (rev 10058)
@@ -51,7 +51,7 @@
function xoFormField( $name, $value, $label, $help = '' )
{
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$label = $myts->htmlspecialchars($label, ENT_QUOTES, _INSTALL_CHARSET, false);
$name = $myts->htmlspecialchars($name, ENT_QUOTES, _INSTALL_CHARSET, false);
$value = $myts->htmlspecialchars($value, ENT_QUOTES);
@@ -68,7 +68,7 @@
function xoPassField($name, $value, $label, $help = '')
{
- $myts =& MyTextSanitizer::getInstance();
+ $myts = MyTextSanitizer::getInstance();
$label = $myts->htmlspecialchars( $label, ENT_QUOTES, _INSTALL_CHARSET, false);
$name = $myts->htmlspecialchars( $name, ENT_QUOTES, _INSTALL_CHARSET, false);
$value = $myts->htmlspecialchars( $value, ENT_QUOTES );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
