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

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

Revision: 7283
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7283&view=rev
Author:   vargenau
Date:     2010-01-18 19:13:06 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
Make saving preferences work in PHP 5

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2009-12-04 17:08:19 UTC (rev 7282)
+++ trunk/lib/WikiUserNew.php	2010-01-18 19:13:06 UTC (rev 7283)
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /* Copyright (C) 2004,2005,2006,2007,2009 $ThePhpWikiProgrammingTeam
  * Copyright (C) 2009 Marc-Etienne Vargenau, Alcatel-Lucent
+ * Copyright (C) 2009 Roger Guignard, Alcatel-Lucent
  *
  * This file is part of PhpWiki.
  * 
@@ -1175,33 +1176,15 @@
                 // FIXME: strange why this should be needed...
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/AdoDb.php");
-                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();
-                }
+                return _AdoDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PearDb.php");
-                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();
-                }
+                return _PearDbPassUser::getPreferences();
             } elseif ($this->_prefs->_method == 'PDO') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PdoDb.php");
-                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();
-                }
+                return _PdoDbPassUser::getPreferences();
             }
         }
 
@@ -1228,35 +1211,17 @@
                 // FIXME: strange why this should be needed...
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/AdoDb.php");
-                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);
-                }
+                return _AdoDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'SQL') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PearDb.php");
-                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);
-                }
+                return _PearDbPassUser::setPreferences($prefs, $id_only);
             }
             elseif ($this->_prefs->_method == 'PDO') {
                 include_once("lib/WikiUser/Db.php");
                 include_once("lib/WikiUser/PdoDb.php");
-                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);
-                }
+                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.