[geeklog-hg] geeklog: Fixed count of submission on the Admin Block is incorrect

[geeklog-cvs at lists.geeklog.net]

changeset 9132:17f2fba92c2e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/17f2fba92c2e
user: dengen
date: Thu Jun 27 19:13:55 2013 +0900
description:
Fixed count of submission on the Admin Block is incorrect

diffstat:

 public_html/lib-common.php |  18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 77cf84863bdf -r 17f2fba92c2e public_html/lib-common.php
--- a/public_html/lib-common.php	Wed Jun 26 23:38:16 2013 +0900
+++ b/public_html/lib-common.php	Thu Jun 27 19:13:55 2013 +0900
@@ -3410,15 +3410,6 @@
         // Allow anything not in the blocks but in the rest of the template file to be displayed
         $retval .= $adminmenu->parse('item', 'adminnavigation', true);
 
-        if (SEC_hasModerationAccess()) {
-            $url = $_CONF['site_admin_url'] . '/moderation.php';
-            $adminmenu->set_var('option_url', $url);
-            $adminmenu->set_var('option_label', $LANG01[10]);
-            $adminmenu->set_var('option_count', COM_numberFormat($modnum));
-            $menu_item = $adminmenu->parse('item', 'option');
-            $link_array[$LANG01[10]] = $menu_item;
-        }
-        
         $topicsql = '';
         if( SEC_isModerator() || SEC_hasRights( 'story.edit' ))
         {
@@ -3494,6 +3485,15 @@
         // now handle submissions for plugins
         $modnum += PLG_getSubmissionCount();
 
+        if (SEC_hasModerationAccess()) {
+            $url = $_CONF['site_admin_url'] . '/moderation.php';
+            $adminmenu->set_var('option_url', $url);
+            $adminmenu->set_var('option_label', $LANG01[10]);
+            $adminmenu->set_var('option_count', COM_numberFormat($modnum));
+            $menu_item = $adminmenu->parse('item', 'option');
+            $link_array[$LANG01[10]] = $menu_item;
+        }
+
         if( SEC_hasRights( 'story.edit' ))
         {
             $url = $_CONF['site_admin_url'] . '/story.php';