Changeset 3298:97a04b84afc9

Timestamp:

08/05/16 11:21:51 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Cope with trailing spaces in permissions, fixes #2194

Location:

inc

Files:

• admin/class.dc.favorites.php (modified) (1 diff)
• core/class.dc.auth.php (modified) (1 diff)

inc/admin/class.dc.favorites.php

@@ -441 +441 @@
                     'small-icon' => 'images/menu/media.png',
                     'large-icon' => 'images/menu/media-b.png',
-                    'permissions' => 'media, media_admin'),
+                    'permissions' => 'media,media_admin'),
                'blog_pref' => array(
                     'title' => __('Blog settings'),

inc/core/class.dc.auth.php

@@ -264 +264 @@
           }
 
-          $p = explode(',',$permissions);
+          $p = array_map('trim',explode(',',$permissions));
           $b = $this->getPermissions($blog_id);