[phpwiki-checkins] SF.net SVN: phpwiki:[6404] trunk/lib/WikiUserNew.php

[<ru...@us...>]

Revision: 6404
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6404&view=rev
Author:   rurban
Date:     2009-01-16 06:26:31 +0000 (Fri, 16 Jan 2009)

Log Message:
-----------

Temp. fix a php-5.2.8 problem reported by Charles Sprickman:
  _PearDbPassUser::_PearDbPassUser() cannot be called statically, assuming 
  $this from incompatible context in /usr/local/www/data/wiki/lib/WikiUserNew.php 
  on line 1118
This is not yet ready.

Modified Paths:
--------------
    trunk/lib/WikiUserNew.php

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009-01-15 10:21:34 UTC (rev 6403)
+++ trunk/lib/WikiUserNew.php	2009-01-16 06:26:31 UTC (rev 6404)
@@ -1164,18 +1164,18 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                _AdoDbPassUser::_AdoDbPassUser($this->_userid, $this->_prefs);
-                return _AdoDbPassUser::getPreferences();
+                $user = new _AdoDbPassUser($this->_userid, $this->_prefs);
+                return $user->getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PearDb.php");
-                _PearDbPassUser::_PearDbPassUser($this->_userid, $this->_prefs);
-                return _PearDbPassUser::getPreferences();
+                $user = new _PearDbPassUser($this->_userid, $this->_prefs);
+                return $user->getPreferences();
             } elseif ($this->_prefs->_method == 'PDO') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PdoDb.php");
-                _PdoDbPassUser::_PdoDbPassUser($this->_userid, $this->_prefs);
-                return _PdoDbPassUser::getPreferences();
+                $user = new _PdoDbPassUser($this->_userid, $this->_prefs);
+                return $user->getPreferences();
             }
         }
 
@@ -1202,20 +1202,20 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                _AdoDbPassUser::_AdoDbPassUser($this->_userid, $prefs);
-                return _AdoDbPassUser::setPreferences($prefs, $id_only);
+                $user = new _AdoDbPassUser($this->_userid, $prefs);
+                return $user->setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'SQL') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PearDb.php");
-                _PearDbPassUser::_PearDbPassUser($this->_userid, $prefs);
-                return _PearDbPassUser::setPreferences($prefs, $id_only);
+                $user = new _PearDbPassUser($this->_userid, $prefs);
+                return $user->setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'PDO') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PdoDb.php");
-                _PdoDbPassUser::_PdoDbPassUser($this->_userid, $prefs);
-                return _PdoDbPassUser::setPreferences($prefs, $id_only);
+                $user = new _PdoDbPassUser($this->_userid, $prefs);
+                return $user->setPreferences($prefs, $id_only);
             }
         }
         if ($updated = _AnonUser::setPreferences($prefs, $id_only)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.