From 132517a8cb2d9e195687e71d6f0a8dbc505843cd Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 4 Nov 2005 08:17:22 +0000
Subject: [PATCH] - Patch #22215 by Richard Archer: theme system improvements
 for the primary links menu.

---
 themes/bluemarine/page.tpl.php | 4 ++--
 themes/pushbutton/page.tpl.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index 9344e69736f..3039ce7fb16 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -18,8 +18,8 @@
       <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
     </td>
     <td id="menu">
-      <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('menu_links', $secondary_links) ?></div><?php } ?>
-      <?php if ($primary_links) { ?><div id="primary"><?php print theme('menu_links', $primary_links) ?></div><?php } ?>
+      <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?>
+      <?php if ($primary_links) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?>
       <?php print $search_box ?>
     </td>
   </tr>
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index 3b6caed8697..76be1f05276 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -34,7 +34,7 @@
     </td>
 
     <td class="primary-links" width="70%" align="center" valign="middle">
-      <?php print theme('menu_links', $primary_links) ?>
+      <?php print theme('links', $primary_links) ?>
     </td>
   </tr>
 </table>
@@ -42,7 +42,7 @@
 <table id="secondary-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
     <td class="secondary-links" width="75%"  align="center" valign="middle">
-      <?php print theme('menu_links', $secondary_links) ?>
+      <?php print theme('links', $secondary_links) ?>
     </td>
     <td  width="25%"  align="center" valign="middle">
       <?php print $search_box ?>
@@ -104,12 +104,12 @@
     <td align="center" valign="middle">
     <?php if (is_array($primary_links)) : ?>
       <div class="primary-links">
-        <?php print theme('menu_links', $primary_links) ?>
+        <?php print theme('links', $primary_links) ?>
       </div>
     <?php endif; ?>
     <?php if (is_array($secondary_links)) : ?>
       <div class="secondary-links">
-        <?php print theme('menu_links', $secondary_links) ?>
+        <?php print theme('links', $secondary_links) ?>
       </div>
     <?php endif; ?>
     </td>