[phpwiki-checkins] SF.net SVN: phpwiki:[10147] trunk/lib

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

Revision: 10147
          http://sourceforge.net/p/phpwiki/code/10147
Author:   vargenau
Date:     2019-09-02 19:17:09 +0000 (Mon, 02 Sep 2019)
Log Message:
-----------
Improve setPreferences()

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

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2019-09-02 16:15:33 UTC (rev 10146)
+++ trunk/lib/ErrorManager.php	2019-09-02 19:17:09 UTC (rev 10147)
@@ -66,7 +66,7 @@
         $this->_postpone_mask = 0;
         $this->_postponed_errors = array();
 
-        set_error_handler('ErrorManager_errorHandler');
+        // set_error_handler('ErrorManager_errorHandler');
     }
 
     /**

Modified: trunk/lib/WikiUser.php
===================================================================
--- trunk/lib/WikiUser.php	2019-09-02 16:15:33 UTC (rev 10146)
+++ trunk/lib/WikiUser.php	2019-09-02 19:17:09 UTC (rev 10147)
@@ -1206,18 +1206,21 @@
                 // FIXME: strange why this should be needed...
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/AdoDb.php';
-                $pref = new _AdoDbPassUser();
-                return $pref->setPreferences($prefs, $id_only);
+                $user = new _AdoDbPassUser();
+                $this->_prefs = $user->setPreferences($prefs, $id_only);
+                return $this->_prefs;
             } elseif ($this->_prefs->_method == 'SQL') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PearDb.php';
-                $pref = new _PearDbPassUser();
-                return $pref->setPreferences($prefs, $id_only);
+                $user = new _PearDbPassUser();
+                $this->_prefs = $user->setPreferences($prefs, $id_only);
+                return $this->_prefs;
             } elseif ($this->_prefs->_method == 'PDO') {
                 include_once 'lib/WikiUser/Db.php';
                 include_once 'lib/WikiUser/PdoDb.php';
-                $pref = new _PdoDbPassUser();
-                return $pref->setPreferences($prefs, $id_only);
+                $user = new _PdoDbPassUser();
+                $this->_prefs = $user->setPreferences($prefs, $id_only);
+                return $this->_prefs;
             }
         }
         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.