diff options
| author | alecpl <alec@alec.pl> | 2011-04-11 12:24:00 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-04-11 12:24:00 +0000 |
| commit | d3105370870a8c51aaeb6a18f561311202da3356 (patch) | |
| tree | 9b0d50549f35a44d7eb438bd7ad3dfa9ca72d263 /program/steps/settings | |
| parent | 382b8b1351e1a4598f04ab184cec803b96d7e4b7 (diff) | |
- Apply fixes from trunk
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | program/steps/settings/save_prefs.inc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index feeb18341..2bf814722 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.inc @@ -97,10 +97,10 @@ switch ($CURR_SECTION) break; } -$data = rcmail::get_instance()->plugins->exec_hook('preferences_save', +$plugin = rcmail::get_instance()->plugins->exec_hook('preferences_save', array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION)); -$a_user_prefs = $data['prefs']; +$a_user_prefs = $plugin['prefs']; // don't override these parameters foreach ((array)$CONFIG['dont_override'] as $p) @@ -159,10 +159,17 @@ switch ($CURR_SECTION) break; } -if ($USER->save_prefs($a_user_prefs)) +// Save preferences +if (!$plugin['abort']) + $saved = $USER->save_prefs($a_user_prefs); +else + $saved = $plugin['result']; + +if ($saved) $OUTPUT->show_message('successfullysaved', 'confirmation'); +else + $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error'); // display the form again rcmail_overwrite_action('edit-prefs'); - |