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

[<var...@us...>]

Revision: 6849
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6849&view=rev
Author:   vargenau
Date:     2009-06-03 13:49:28 +0000 (Wed, 03 Jun 2009)

Log Message:
-----------
Protect modification from revision 6404 with check_php_version

Revision Links:
--------------
    http://phpwiki.svn.sourceforge.net/phpwiki/?rev=6404&view=rev

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009-06-03 11:59:14 UTC (rev 6848)
+++ trunk/lib/WikiUserNew.php	2009-06-03 13:49:28 UTC (rev 6849)
@@ -1167,18 +1167,33 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                $user = new _AdoDbPassUser($this->_userid, $this->_prefs);
-                return $user->getPreferences();
+                if (check_php_version(5)) {
+                    $user = new _AdoDbPassUser($this->_userid, $this->_prefs);
+                    return $user->getPreferences();
+                } else {
+                    _AdoDbPassUser::_AdoDbPassUser($this->_userid, $this->_prefs);
+                    return _AdoDbPassUser::getPreferences();
+                }
             } elseif ($this->_prefs->_method == 'SQL') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PearDb.php");
-                $user = new _PearDbPassUser($this->_userid, $this->_prefs);
-                return $user->getPreferences();
+                if (check_php_version(5)) {
+                    $user = new _PearDbPassUser($this->_userid, $this->_prefs);
+                    return $user->getPreferences();
+                } else {
+                    _PearDbPassUser::_PearDbPassUser($this->_userid, $this->_prefs);
+                    return _PearDbPassUser::getPreferences();
+                }
             } elseif ($this->_prefs->_method == 'PDO') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PdoDb.php");
-                $user = new _PdoDbPassUser($this->_userid, $this->_prefs);
-                return $user->getPreferences();
+                if (check_php_version(5)) {
+                    $user = new _PdoDbPassUser($this->_userid, $this->_prefs);
+                    return $user->getPreferences();
+                } else {
+                    _PdoDbPassUser::_PdoDbPassUser($this->_userid, $this->_prefs);
+                    return _PdoDbPassUser::getPreferences();
+                }
             }
         }
 
@@ -1205,20 +1220,35 @@
             	// FIXME: strange why this should be needed...
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/AdoDb.php");
-                $user = new _AdoDbPassUser($this->_userid, $prefs);
-                return $user->setPreferences($prefs, $id_only);
+                if (check_php_version(5)) {
+                    $user = new _AdoDbPassUser($this->_userid, $prefs);
+                    return $user->setPreferences($prefs, $id_only);
+                } else {
+                    _AdoDbPassUser::_AdoDbPassUser($this->_userid, $prefs);
+                    return _AdoDbPassUser::setPreferences($prefs, $id_only);
+                }
             }
             elseif ($this->_prefs->_method == 'SQL') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PearDb.php");
-                $user = new _PearDbPassUser($this->_userid, $prefs);
-                return $user->setPreferences($prefs, $id_only);
+                if (check_php_version(5)) {
+                    $user = new _PearDbPassUser($this->_userid, $prefs);
+                    return $user->setPreferences($prefs, $id_only);
+                } else {
+                    _PearDbPassUser::_PearDbPassUser($this->_userid, $prefs);
+                    return _PearDbPassUser::setPreferences($prefs, $id_only);
+                }
             }
             elseif ($this->_prefs->_method == 'PDO') {
             	include_once("lib/WikiUser/Db.php");
             	include_once("lib/WikiUser/PdoDb.php");
-                $user = new _PdoDbPassUser($this->_userid, $prefs);
-                return $user->setPreferences($prefs, $id_only);
+                if (check_php_version(5)) {
+                    $user = new _PdoDbPassUser($this->_userid, $prefs);
+                    return $user->setPreferences($prefs, $id_only);
+                } else {
+                    _PdoDbPassUser::_PdoDbPassUser($this->_userid, $prefs);
+                    return _PdoDbPassUser::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.