diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/error.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 6 | ||||
| -rw-r--r-- | program/steps/settings/manage_folders.inc | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/program/steps/error.inc b/program/steps/error.inc index 2d87a9da4..f616ba1bf 100644 --- a/program/steps/error.inc +++ b/program/steps/error.inc @@ -69,11 +69,11 @@ else { $__error_title = "SERVICE CURRENTLY NOT AVAILABLE!"; $__error_text = "Please contact your server-administrator."; - + if (($CONFIG['debug_level'] & 4) && $ERROR_MESSAGE) $__error_text = $ERROR_MESSAGE; else - $__error_text = 'Error No. '.dechex($ERROR_CODE).')'; + $__error_text = 'Error No. ['.dechex($ERROR_CODE).']'; } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0cd6652ad..827f13100 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1245,9 +1245,9 @@ function rcmail_first_text_part($message_struct) { global $IMAP; - if (!is_array($message_struct['parts'])) - return FALSE; - + if (empty($message_struct['parts'])) + return $message_struct['UID'] ? $IMAP->get_body($message_struct['UID']) : false; + // check all message parts foreach ($message_struct['parts'] as $pid => $part) { diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index af0c829ef..e938908cf 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.inc @@ -73,10 +73,12 @@ else if ($_action=='rename-folder') if ($rename && $REMOTE_REQUEST) { - $commands = sprintf("this.replace_folder_row('%s','%s','%s');", + $commands = sprintf("this.replace_folder_row('%s','%s','%s');\n", rep_specialchars_output(get_input_value('_folder_oldname', RCUBE_INPUT_GET), 'js'), rep_specialchars_output($rename, 'js'), rep_specialchars_output(rcube_charset_convert($rename, 'UTF-7'), 'js')); + + $commands .= "this.reset_folder_rename();\n"; rcube_remote_response($commands); } |