Changeset 106:cca7b21765d2 for inc/admin/prepend.php

Timestamp:

05/02/11 13:50:51 (14 years ago)

Author:

xpla@…

Branch:

userprefs

Message:

Bugfix for userprefs load.

File:

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

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());
-          }
-     }
-}
+     }
 ?>