fsf changes, meant to be rebased on upstream

[squirrelmail.git] / src / options.php

diff --git a/src/options.php b/src/options.php
index ee53008e8878596005a0230107cd1a8c054c9abb..b58dbab180a5a0bd5a1665be9def137f8259341c 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -6,7 +6,7 @@
  * Displays the options page. Pulls from proper user preference files
  * and config.php. Displays preferences as selected and other options.
  *
- * @copyright 1999-2013 The SquirrelMail Project Team
+ * @copyright 1999-2024 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -70,7 +70,7 @@ function process_optionmode_submit($optpage, $optpage_data) {
             /* Special case: need to make sure emailaddress
              * is saved if we use it as a test for ask_user_info */
             global $ask_user_info;
-            if ( $optpage = SMOPT_PAGE_PERSONAL && $ask_user_info &&
+            if ( $optpage == SMOPT_PAGE_PERSONAL && $ask_user_info &&
                 $option->name == 'email_address' ) {
                 $option->setValue('');
             }
@@ -466,7 +466,7 @@ if ($optpage == SMOPT_PAGE_MAIN) {
             $submit_name = 'submit_order';
             break;
         default:
-            $bottom_hook_name = '';
+            $bottom_hook_name = 'options_generic_bottom';
             $submit_name = 'submit';
     }