Changeset 8223 for trunk

Timestamp:

Dec 22, 2010, 12:14:20 PM (14 years ago)

Author:

patdenice

Message:

merge r8222 from branch 2.1 to trunk
bug 2078: Links must not be displayed in menubar if empty.

Location:

trunk

Files:

• . (modified) (1 prop)
• include/menubar.inc.php (modified) (2 diffs)

trunk/include/menubar.inc.php

@@ -42 +42 @@
   if ( ($block=$menu->get_block('mbLinks')) and !empty($conf['links']) )
   {
-    $data = array();
+    $block->data = array();
     foreach ($conf['links'] as $url => $url_data)
     {
@@ -70 +70 @@
             );
         }
-        $data[] = $tpl_var;
+        $block->data[] = $tpl_var;
       }
     }
-    $block->template = 'menubar_links.tpl';
-    $block->data = $data;
+    if ( !empty($block->data) )
+    {
+      $block->template = 'menubar_links.tpl';
+    }
   }