Changeset 896:89a7eea61559

Timestamp:

10/23/12 10:50:22 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Favs are displayed on Dashboard only if enabled, fixes #1301

File:

• admin/index.php (modified) (2 diffs)

admin/index.php

@@ -81 +81 @@
           $fav = unserialize($v['value']);
           if (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)) {
-               $count++;
-               $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-                    ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
-               $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
-
-               # Let plugins set their own title for favorite on dashboard
-               $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
+               if (dc_valid_fav($fav['url'])) {
+                    $count++;
+                    $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
+                         ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+                    $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
+
+                    # Let plugins set their own title for favorite on dashboard
+                    $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
+               }
           }
      }
@@ -96 +98 @@
           $fav = unserialize($v['value']);
           if (($fav['permissions'] == '*') || $core->auth->check($fav['permissions'],$core->blog->id)) {
-               $count++;
-               $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
-                    ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
-               $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
-
-               # Let plugins set their own title for favorite on dashboard
-               $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
+               if (dc_valid_fav($fav['url'])) {
+                    $count++;
+                    $title = ($fav['name'] == 'posts' ? sprintf($str_entries,$post_count) : 
+                         ($fav['name'] == 'comments' ? sprintf($str_comments,$comment_count) : $fav['title']));
+                    $__dashboard_icons[$fav['name']] = new ArrayObject(array(__($title),$fav['url'],$fav['large-icon']));
+
+                    # Let plugins set their own title for favorite on dashboard
+                    $core->callBehavior('adminDashboardFavsIcon',$core,$fav['name'],$__dashboard_icons[$fav['name']]);
+               }
           }
      }