Rewritten overview-inc.php, internal TODO closed

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index abb5ba51f1f641bbed6e43eea7d539edef479f40..7fbc40432c7cd187b575c972704b115b7a747026 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -357,7 +357,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                }
                                $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <nobr>&nbsp;<strong>&middot;</strong>&nbsp;";
+               <div class=\"nobr\">&nbsp;<strong>&middot;</strong>&nbsp;";
 
                                if (($menu == $act) && (empty($wht))) {
                                        $OUT .= "<strong>";
@@ -373,7 +373,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                        $OUT .= "</a>]";
                                }
 
-                               $OUT .= "</nobr></td>
+                               $OUT .= "</div></td>
 </tr>\n";
 
                                // Check for menu entries
@@ -384,7 +384,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)));
 
                                // Do we have entries?
-                               if (ifAdminMenuHasEntries($menu)) {
+                               if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
                                        $GLOBALS['menu']['description'] = array();
                                        $GLOBALS['menu']['title'] = array(); $SUB = true;
                                        $OUT .= "<tr>
@@ -412,7 +412,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                        $GLOBALS['menu']['description'][$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <nobr>&nbsp;<strong>--&gt;</strong>&nbsp;";
+               <div class=\"nobr\">&nbsp;<strong>--&gt;</strong>&nbsp;";
                                                        if ($readable === true) {
                                                                if ($wht == $wht_sub) {
                                                                        $OUT .= "<strong>";
@@ -434,7 +434,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                        } else {
                                                                $OUT .= "</em>";
                                                        }
-                                                       $OUT .= "</nobr></td>
+                                                       $OUT .= "</div></td>
 </tr>\n";
                                                }
                                        }