Changes in [91:e3f1423902d7:92:e6150a97934d]

Files:

• inc/admin/prepend.php (modified) (2 diffs)
• plugins/blowupConfig/config.js (modified) (1 diff)

inc/admin/prepend.php

@@ -147 +147 @@
      }
 */
-}
-
-if (!empty($_GET['logout'])) {
-     // Nothing more to do here before logout
-     return;
 }
 
@@ -298 +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;
-     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
+     try {
+          // Set favorites menu
+          $ws = $core->auth->user_prefs->addWorkspace('favorites');
+          $count = 0;
           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);
+               // 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());
+          }
      }
 }

plugins/blowupConfig/config.js

@@ -36 +36 @@
      
      // Predefined styles
-     // /!\ needs geek master to add locale for attr title="Choose a predefined style" in select tag
      var styles_combo = document.createElement('select');
      $(styles_combo).append('<option value="">&nbsp;</option>');