浏览代码

Remove accidental commits that were included in last page_header commit

pdontthink 18 年之前
父节点
当前提交
664a3eb94a
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      functions/page_header.php

+ 2 - 3
functions/page_header.php

@@ -144,7 +144,7 @@ body {
 
 
 EOS;
 EOS;
 
 
-    $oTemplate->assign('header_tags', $header_tags, FALSE);
+    $oTemplate->assign('header_tags', $header_tags);
     $oTemplate->display('protocol_header.tpl');
     $oTemplate->display('protocol_header.tpl');
 
 
     /* this is used to check elsewhere whether we should call this function */
     /* 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
      * this explains the imap_mailbox.php dependency. We should instead store
      * the selected mailbox in the session and fallback to the session var.
      * 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(
     $shortBoxName = htmlspecialchars(imap_utf7_decode_local(
                 readShortMailboxName($mailbox, $delimiter)));
                 readShortMailboxName($mailbox, $delimiter)));
     if ( $shortBoxName == 'INBOX' ) {
     if ( $shortBoxName == 'INBOX' ) {
@@ -255,7 +254,7 @@ function displayPageHeader($color, $mailbox='', $sHeaderJs='', $sBodyTagJs = '')
 
 
     $oTemplate->assign('body_tag_js', $sBodyTagJs);
     $oTemplate->assign('body_tag_js', $sBodyTagJs);
     $oTemplate->assign('shortBoxName', $shortBoxName);
     $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('frame_top', $frame_top);
     $oTemplate->assign('urlMailbox', $urlMailbox);
     $oTemplate->assign('urlMailbox', $urlMailbox);
     $oTemplate->assign('startMessage', $startMessage);
     $oTemplate->assign('startMessage', $startMessage);