[geeklog-cvs] geeklog: When a plugin returns 0 items for the Admins Block, don...

[geeklog-cvs at lists.geeklog.net]

changeset 7445:b0971977fd28
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b0971977fd28
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 07 11:35:44 2009 +0100
description:
When a plugin returns 0 items for the Admins Block, don't display that as 'N/A' (bug #0001025)

diffstat:

 plugins/spamx/functions.inc |   2 +-
 public_html/docs/history    |   2 ++
 public_html/lib-common.php  |  39 +++++++++++++++++++--------------------
 3 files changed, 22 insertions(+), 21 deletions(-)

diffs (75 lines):

diff -r 252d8d24012d -r b0971977fd28 plugins/spamx/functions.inc
--- a/plugins/spamx/functions.inc	Sat Nov 07 11:15:02 2009 +0100
+++ b/plugins/spamx/functions.inc	Sat Nov 07 11:35:44 2009 +0100
@@ -139,7 +139,7 @@
 
     if (SEC_hasRights('spamx.admin')) {
         return array($LANG_SX00['plugin_name'],
-            $_CONF['site_admin_url'] . '/plugins/spamx/index.php', 0);
+            $_CONF['site_admin_url'] . '/plugins/spamx/index.php', '');
     }
 }
 
diff -r 252d8d24012d -r b0971977fd28 public_html/docs/history
--- a/public_html/docs/history	Sat Nov 07 11:15:02 2009 +0100
+++ b/public_html/docs/history	Sat Nov 07 11:35:44 2009 +0100
@@ -4,6 +4,8 @@
 ------------
 
 Changes since 1.6.1b1:
+- When a plugin returns 0 items for the Admins Block, don't display that as
+  'N/A' (bug #0001025) [Dirk]
 - Fixed a bug in the Group Editor that didn't let you add groups to other groups
   unless your $_TABLES['groups'] happened to be called "groups" (bug #0000998)
   [Dirk]
diff -r 252d8d24012d -r b0971977fd28 public_html/lib-common.php
--- a/public_html/lib-common.php	Sat Nov 07 11:15:02 2009 +0100
+++ b/public_html/lib-common.php	Sat Nov 07 11:35:44 2009 +0100
@@ -2758,28 +2758,27 @@
 
         // This will show the admin options for all installed plugins (if any)
 
-        for( $i = 0; $i < $num_plugins; $i++ )
-        {
-            $plg = current( $plugin_options );
-
-            $adminmenu->set_var( 'option_url', $plg->adminurl );
-            $adminmenu->set_var( 'option_label', $plg->adminlabel );
-
-            if( empty( $plg->numsubmissions ))
-            {
-                $adminmenu->set_var( 'option_count', $LANG_ADMIN['na'] );
-            }
-            else
-            {
-                $adminmenu->set_var( 'option_count',
-                                     COM_numberFormat( $plg->numsubmissions ));
-            }
-
-            $menu_item = $adminmenu->parse( 'item',
-                    ( $thisUrl == $plg->adminurl ) ? 'current' : 'option', true );
+        for ($i = 0; $i < $num_plugins; $i++) {
+            $plg = current($plugin_options);
+
+            $adminmenu->set_var('option_url',   $plg->adminurl);
+            $adminmenu->set_var('option_label', $plg->adminlabel);
+
+            if (isset($plg->numsubmissions) &&
+                    is_numeric($plg->numsubmissions)) {
+                $adminmenu->set_var('option_count',
+                                    COM_numberFormat($plg->numsubmissions));
+            } elseif (! empty($plg->numsubmissions)) {
+                $adminmenu->set_var('option_count', $plg->numsubmissions);
+            } else {
+                $adminmenu->set_var('option_count', $LANG_ADMIN['na']);
+            }
+
+            $menu_item = $adminmenu->parse('item',
+                    ($thisUrl == $plg->adminurl) ? 'current' : 'option', true);
             $link_array[$plg->adminlabel] = $menu_item;
 
-            next( $plugin_options );
+            next($plugin_options);
         }
 
         if(( $_CONF['allow_mysqldump'] == 1 ) AND ( $_DB_dbms == 'mysql' ) AND