From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 30 Aug 2007 03:35:19 +0000 (+0000)
Subject: Remove accidental commits that were included in last page_header commit
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4bf6fc19ad154c0f8c7775b4b41f91ff323a53e9;p=squirrelmail.git

Remove accidental commits that were included in last page_header commit

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12633 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/page_header.php b/functions/page_header.php
index 6bf4d612..17e1d1aa 100644
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -144,7 +144,7 @@ body {
 
 EOS;
 
-    $oTemplate->assign('header_tags', $header_tags, FALSE);
+    $oTemplate->assign('header_tags', $header_tags);
     $oTemplate->display('protocol_header.tpl');
 
     /* this is used to check elsewhere whether we should call this function */
@@ -241,7 +241,6 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
      * this explains the imap_mailbox.php dependency. We should instead store
      * the selected mailbox in the session and fallback to the session var.
      */
-//FIXME: $shortBoxName will be sanitized when assigned to template, so remove htmlspecialchars on the following line?
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
                 readShortMailboxName($mailbox, $delimiter)));
     if ( $shortBoxName == 'INBOX' ) {
@@ -255,7 +254,7 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
 
     $oTemplate->assign('body_tag_js', $sBodyTagJs);
     $oTemplate->assign('shortBoxName', $shortBoxName);
-    $oTemplate->assign('provider_link', $provider_link, FALSE);
+    $oTemplate->assign('provider_link', $provider_link);
     $oTemplate->assign('frame_top', $frame_top);
     $oTemplate->assign('urlMailbox', $urlMailbox);
     $oTemplate->assign('startMessage', $startMessage);