[SM-CVS] SF.net SVN: squirrelmail: [12633] trunk/squirrelmail/functions/page_header. php

[<pdo...@us...>]

Revision: 12633
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=12633&view=rev
Author:   pdontthink
Date:     2007-08-29 20:35:19 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Remove accidental commits that were included in last page_header commit

Modified Paths:
--------------
    trunk/squirrelmail/functions/page_header.php

Modified: trunk/squirrelmail/functions/page_header.php
===================================================================
--- trunk/squirrelmail/functions/page_header.php	2007-08-30 03:28:25 UTC (rev 12632)
+++ trunk/squirrelmail/functions/page_header.php	2007-08-30 03:35:19 UTC (rev 12633)
@@ -144,7 +144,7 @@
 
 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 @@
      * 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 @@
 
     $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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.