From: <var...@us...> - 2009-09-10 16:09:07
|
Revision: 7108 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7108&view=rev Author: vargenau Date: 2009-09-10 16:08:56 +0000 (Thu, 10 Sep 2009) Log Message: ----------- Whitespace only Modified Paths: -------------- trunk/lib/WikiUserNew.php Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2009-09-10 14:54:37 UTC (rev 7107) +++ trunk/lib/WikiUserNew.php 2009-09-10 16:08:56 UTC (rev 7108) @@ -1171,9 +1171,9 @@ function getPreferences() { if (!empty($this->_prefs->_method)) { if ($this->_prefs->_method == 'ADODB') { - // FIXME: strange why this should be needed... - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/AdoDb.php"); + // 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(); @@ -1182,8 +1182,8 @@ return _AdoDbPassUser::getPreferences(); } } elseif ($this->_prefs->_method == 'SQL') { - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/PearDb.php"); + 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(); @@ -1192,8 +1192,8 @@ return _PearDbPassUser::getPreferences(); } } elseif ($this->_prefs->_method == 'PDO') { - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/PdoDb.php"); + 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(); @@ -1224,9 +1224,9 @@ function setPreferences($prefs, $id_only=false) { if (!empty($this->_prefs->_method)) { if ($this->_prefs->_method == 'ADODB') { - // FIXME: strange why this should be needed... - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/AdoDb.php"); + // 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); @@ -1236,8 +1236,8 @@ } } elseif ($this->_prefs->_method == 'SQL') { - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/PearDb.php"); + 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); @@ -1247,8 +1247,8 @@ } } elseif ($this->_prefs->_method == 'PDO') { - include_once("lib/WikiUser/Db.php"); - include_once("lib/WikiUser/PdoDb.php"); + 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); @@ -2112,9 +2112,9 @@ if (!is_array($packed)) return false; $prefs = array(); foreach ($packed as $name => $packed_pref) { - if (is_string($packed_pref) - and isSerialized($packed_pref) - and substr($packed_pref, 0, 2) == "O:") + if (is_string($packed_pref) + and isSerialized($packed_pref) + and substr($packed_pref, 0, 2) == "O:") { //legacy: check if it's an old array of objects // Looks like a serialized object. @@ -2130,7 +2130,7 @@ $prefs[$name] = $value; } } else { - if (isSerialized($packed_pref)) + if (isSerialized($packed_pref)) $prefs[$name] = @unserialize($packed_pref); if (empty($prefs[$name]) and isSerialized(base64_decode($packed_pref))) $prefs[$name] = @unserialize(base64_decode($packed_pref)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |