Changeset 139:3ccd56e7922b

Timestamp:

05/04/11 13:26:40 (14 years ago)

Author:

xave <xave@…>

Branch:

userprefs

Message:

Back where we started!

Files:

• admin/index.php (modified) (1 diff)
• inc/admin/prepend.php (modified) (1 diff)
• inc/core/class.dc.prefs.php (modified) (3 diffs)

admin/index.php

@@ -44 +44 @@
 
 # Check dashboard module prefs
-$core->auth->user_prefs->loadPrefs();
-     
-     // Set favorites menu
-     $ws = $core->auth->user_prefs->addWorkspace('favorites');
-     $count = 0;
-     foreach ($ws->dumpPrefs() as $k => $v) {
-          // User favorites only
-          if (!$v['global']) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }    
-     if (!$count) {
-          // Global favorites if any
-          foreach ($ws->dumpPrefs() as $k => $v) {
-               $count++;
-               $fav = unserialize($v['value']);
-               $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
-                    preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
-                    (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
-          }
-     }
-     if (!$count) {
-          // No user or global favorites, add "new entry" fav
-          $_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
-               preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
-               $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
-     }
 $core->auth->user_prefs->addWorkspace('dashboard');
 if (!$core->auth->user_prefs->dashboard->prefExists('doclinks')) {

inc/admin/prepend.php

@@ -292 +292 @@
           $core->auth->isSuperAdmin() ||
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
+
+     try {
+          // Set favorites menu
+          $ws = $core->auth->user_prefs->addWorkspace('favorites');
+          $count = 0;
+          foreach ($ws->dumpPrefs() as $k => $v) {
+               // User favorites only
+               if (!$v['global']) {
+                    $count++;
+                    $fav = unserialize($v['value']);
+                    $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
+                         preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
+          }    
+          if (!$count) {
+               // Global favorites if any
+               foreach ($ws->dumpPrefs() as $k => $v) {
+                    $count++;
+                    $fav = unserialize($v['value']);
+                    $_menu['Favorites']->addItem($fav['title'],$fav['url'],$fav['small-icon'],
+                         preg_match('/'.$fav['url'].'(\?.*)?$/',$_SERVER['REQUEST_URI']),
+                         (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)),$fav['id'],$fav['class']);
+               }
+          }
+          if (!$count) {
+               // No user or global favorites, add "new entry" fav
+               $_menu['Favorites']->addItem(__('New entry'),'post.php','images/menu/edit.png',
+                    preg_match('/post.php$/',$_SERVER['REQUEST_URI']),
+                    $core->auth->check('usage,contentadmin',$core->blog->id),'menu-new-post',null);
+          }
+     } catch (Exception $e) {
+          $version = $core->getVersion('core');
+          if (version_compare($version,'2.3','<')) {
+               ;    // Ignore lack of dc_pref table before the logout following an auto-update
+          } else {
+               $core->error->add($e->getMessage());
+          }
+     }
      }
 ?>

inc/core/class.dc.prefs.php

@@ -42 +42 @@
           $this->table = $core->prefix.'pref';
           $this->user_id =& $user_id;
-          //~ $this->loadPrefs();
+          $this->loadPrefs();
      }
      
@@ -48 +48 @@
      Retrieves all workspaces (and their prefs) from database, with one query. 
      */
-     public function loadPrefs()
+     private function loadPrefs()
      {
           $strReq = 'SELECT user_id, pref_id, pref_value, '.
@@ -60 +60 @@
           } catch (Exception $e) {
                trigger_error(__('Unable to retrieve workspaces:').' '.$this->con->error(), E_USER_ERROR);
-               throw $e;
           }