[phpwiki-checkins] SF.net SVN: phpwiki:[10128] trunk/lib/WikiUser.php

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

Revision: 10128
          http://sourceforge.net/p/phpwiki/code/10128
Author:   vargenau
Date:     2019-07-20 16:34:29 +0000 (Sat, 20 Jul 2019)
Log Message:
-----------
Make login work in PHP 7

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

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2019-07-20 03:42:55 UTC (rev 10127)
+++ trunk/lib/WikiUser.php	2019-07-20 16:34:29 UTC (rev 10128)
@@ -1159,15 +1159,18 @@
                 // FIXME: strange why this should be needed...
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/AdoDb.php';
-                return _AdoDbPassUser::getPreferences();
+                $pref = new _AdoDbPassUser();
+                return $pref->getPreferences();
             } elseif ($this->_prefs->_method == 'SQL') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PearDb.php';
-                return _PearDbPassUser::getPreferences();
+                $pref = new _PearDbPassUser();
+                return $pref->getPreferences();
             } elseif ($this->_prefs->_method == 'PDO') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PdoDb.php';
-                return _PdoDbPassUser::getPreferences();
+                $pref = new _PdoDbPassUser();
+                return $pref->getPreferences();
             }
         }
 
@@ -1200,15 +1203,18 @@
                 // FIXME: strange why this should be needed...
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/AdoDb.php';
-                return _AdoDbPassUser::setPreferences($prefs, $id_only);
+                $pref = new _AdoDbPassUser();
+                return $pref->setPreferences($prefs, $id_only);
             } elseif ($this->_prefs->_method == 'SQL') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PearDb.php';
-                return _PearDbPassUser::setPreferences($prefs, $id_only);
+                $pref = new _PearDbPassUser();
+                return $pref->setPreferences($prefs, $id_only);
             } elseif ($this->_prefs->_method == 'PDO') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PdoDb.php';
-                return _PdoDbPassUser::setPreferences($prefs, $id_only);
+                $pref = new _PdoDbPassUser();
+                return $pref->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.