From 6a2f09c8d6dc564390267aa9fe0549e878807b33 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 27 Jan 2004 22:37:50 +0000
Subject: [PATCH] fixed default args: no objects

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@2966 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/UserPreferences.php | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/lib/plugin/UserPreferences.php b/lib/plugin/UserPreferences.php
index 672e9a14c..fbd1178ff 100644
--- a/lib/plugin/UserPreferences.php
+++ b/lib/plugin/UserPreferences.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: UserPreferences.php,v 1.14 2004-01-26 09:18:00 rurban Exp $');
+rcs_id('$Id: UserPreferences.php,v 1.15 2004-01-27 22:37:50 rurban Exp $');
 /**
  Copyright 2001, 2002, 2003 $ThePhpWikiProgrammingTeam
 
@@ -36,17 +36,19 @@ extends WikiPlugin
 
     function getVersion() {
         return preg_replace("/[Revision: $]/", '',
-                            "\$Revision: 1.14 $");
+                            "\$Revision: 1.15 $");
     }
 
     function getDefaultArguments() {
         global $request;
         $pagename = $request->getArg('pagename');
-        // take current userid from request
         $user = $request->getUser();
-        $userid = $user->UserName();
-        $prefs = $user->getPreferences();
-        // return defaults established by the UserPreferences class
+        //we need a hash of pref => default_value
+        $pref = $user->getPreferences();
+        $prefs = array();
+        foreach ($pref->_prefs as $name => $obj) {
+            $prefs[$name] = $obj->default_value;
+        }
         return $prefs;
     }
 
@@ -131,6 +133,26 @@ extends WikiPlugin
 };
 
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2004/01/26 09:18:00  rurban
+// * changed stored pref representation as before.
+//   the array of objects is 1) bigger and 2)
+//   less portable. If we would import packed pref
+//   objects and the object definition was changed, PHP would fail.
+//   This doesn't happen with an simple array of non-default values.
+// * use $prefs->retrieve and $prefs->store methods, where retrieve
+//   understands the interim format of array of objects also.
+// * simplified $prefs->get() and fixed $prefs->set()
+// * added $user->_userid and class '_WikiUser' portability functions
+// * fixed $user object ->_level upgrading, mostly using sessions.
+//   this fixes yesterdays problems with loosing authorization level.
+// * fixed WikiUserNew::checkPass to return the _level
+// * fixed WikiUserNew::isSignedIn
+// * added explodePageList to class PageList, support sortby arg
+// * fixed UserPreferences for WikiUserNew
+// * fixed WikiPlugin for empty defaults array
+// * UnfoldSubpages: added pagename arg, renamed pages arg,
+//   removed sort arg, support sortby arg
+//
 // Revision 1.13  2003/12/04 20:27:00  carstenklapp
 // Use the API.
 //
-- 
2.45.0