Sorry, removing things unrelated to last commit

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

diff --git a/src/options.php b/src/options.php
index 7380037399f2307ba92a07be9ec69324165f0924..499a4359d2591aee3cd36c2a227f04d9c5562c3c 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -285,7 +285,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
     }
     
     if (!empty($notice)) {
     }
     
     if (!empty($notice)) {

-        $oTemplate->assign('note', $notice, FALSE);
+        $oTemplate->assign('note', $notice);

         $oTemplate->display('note.tpl');
     }
     
         $oTemplate->display('note.tpl');
     }
     


@@ -424,9 +424,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
          "  <td colspan=\"2\">\n";
 
     // This is the only variable that is needed by *just* the template.
          "  <td colspan=\"2\">\n";
 
     // This is the only variable that is needed by *just* the template.

-    // No output sanitizing needed because all widgets added through 
-    // template output already
-    $oTemplate->assign('options', $optpage_data['options'], FALSE);
+    $oTemplate->assign('options', $optpage_data['options']);

     
     global $ask_user_info, $org_name;
     if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info
     
     global $ask_user_info, $org_name;
     if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info