X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2Fdefault%2Fpage_header.tpl;h=17486a46bff30b5444729e7993ddf75b336f8e20;hb=119bd59fea8b21872ea49e1ed679b010177d5fec;hp=99a4de40f129357179f7c066fd5b998afaede807;hpb=876fdb605dcb48b44b5c0a3a6f2f106c941e5c20;p=squirrelmail.git

diff --git a/templates/default/page_header.tpl b/templates/default/page_header.tpl
index 99a4de40..17486a46 100644
--- a/templates/default/page_header.tpl
+++ b/templates/default/page_header.tpl
@@ -75,19 +75,25 @@ $help_link		= makeInternalLink ('src/help.php', $help_str);
   </td>
  </tr>
  <tr>
-  <td class="sqm_topNavigation"<?php echo (empty($provider_link) ? ' colspan="2"' : ''); ?>>
+  <td class="sqm_topNavigation">
    <?php echo $compose_link; ?>&nbsp;&nbsp;
    <?php echo $address_link; ?>&nbsp;&nbsp;
    <?php echo $folders_link; ?>&nbsp;&nbsp;
    <?php echo $options_link; ?>&nbsp;&nbsp;
    <?php echo $search_link; ?>&nbsp;&nbsp;
    <?php echo $help_link; ?>&nbsp;&nbsp;
-   <?php /* FIXME: no hooks in templates!! */ global $null; do_hook('menuline', $null); ?>
+   <?php if (!empty($plugin_output['menuline'])) echo $plugin_output['menuline']; ?>
+  </td>
+  <td class="sqm_providerInfo">
+   <?php 
+       if (!empty($plugin_output['provider_link_before']))
+           echo $plugin_output['provider_link_before'];
+       if (!empty($provider_link))
+           echo $provider_link;
+       if (!empty($plugin_output['provider_link_after']))
+           echo $plugin_output['provider_link_after'];
+   ?>
   </td>
-  <?php if (!empty($provider_link))
-            echo '<td class="sqm_providerInfo">'
-               . $provider_link
-               . "</td>\n"; ?>
  </tr>
 </table>
 </div>