Changeset 157:85955f425334 for inc/admin

Timestamp:

05/05/11 06:58:44 (14 years ago)

Author:

Franck <carnet.franck.paul@…>

Branch:

userprefs

Message:

Fix for unexisting dashboard prefs

File:

• inc/admin/prepend.php (modified) (1 diff)

inc/admin/prepend.php

@@ -293 +293 @@
           $core->auth->check('usage,contentadmin',$core->blog->id) && $core->auth->blog_count > 1);
 
-          // Set favorites menu
-          $ws = $core->auth->user_prefs->addWorkspace('favorites');
-          $count = 0;
+     // 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) {
-               // 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);
-          }
+               $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);
+     }
 }
 ?>