Changeset 3966:781d8ab633bd for inc/admin

Timestamp:

05/09/19 14:06:32 (6 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Do not set "New entry" menuitem as active on existing post editing mode, fixes #2297

File:

• inc/admin/prepend.php (modified) (3 diffs)

inc/admin/prepend.php

@@ -63 +63 @@
 }
 
-function addMenuItem($section, $desc, $adminurl, $icon, $perm, $pinned = false)
+function addMenuItem($section, $desc, $adminurl, $icon, $perm, $pinned = false, $strict = false)
 {
     global $core, $_menu;
 
-    $url = $core->adminurl->get($adminurl);
+    $url     = $core->adminurl->get($adminurl);
+    $pattern = '@' . preg_quote($url) . ($strict ? '' : '(\?.*)?') . '$@';
     $_menu[$section]->prependItem($desc, $url, $icon,
-        preg_match('/' . preg_quote($url) . '(\?.*)?$/', $_SERVER['REQUEST_URI']), $perm, null, null, $pinned);
+        preg_match($pattern, $_SERVER['REQUEST_URI']), $perm, null, null, $pinned);
 }
 
@@ -228 +229 @@
     $user_ui_nofavmenu = $core->auth->user_prefs->interface->nofavmenu;
 
-    $core->favs = new dcFavorites($core);
+    $core->favs    = new dcFavorites($core);
     $core->notices = new dcNotices($core);
 
@@ -272 +273 @@
         $core->auth->check('usage,contentadmin', $core->blog->id));
     addMenuItem('Blog', __('New entry'), 'admin.post', 'images/menu/edit.png',
-        $core->auth->check('usage,contentadmin', $core->blog->id), true);
+        $core->auth->check('usage,contentadmin', $core->blog->id), true, true);
 
     addMenuItem('System', __('Update'), 'admin.update', 'images/menu/update.png',