From 48dc9174a0a3737d68d0c5e0a4e85185a6739019 Mon Sep 17 00:00:00 2001 From: cigamit Date: Fri, 20 Feb 2004 16:36:33 +0000 Subject: [PATCH] The DMN Option was not working correctly, the preference was only being loaded in read_body, which means the option never pulled it. This should fix this bug and close the tracker http://sourceforge.net/tracker/index.php?func=detail&aid=890109&group_id=311&atid=100311 Does someone with access want to close that one for me? git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6613 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- include/load_prefs.php | 2 ++ src/read_body.php | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/load_prefs.php b/include/load_prefs.php index a5658735..ace9d8ee 100644 --- a/include/load_prefs.php +++ b/include/load_prefs.php @@ -283,6 +283,8 @@ $truncate_subject = getPref($data_dir, $username, 'truncate_subject', 50); /* Allow user to show recipient name if the message is from default identity */ $show_recipient_instead = getPref($data_dir, $username, 'show_recipient_instead', 0); +$delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', 1); + do_hook('loading_prefs'); ?> diff --git a/src/read_body.php b/src/read_body.php index 77d6020d..916df167 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -490,7 +490,7 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp global $base_uri, $draft_folder, $where, $what, $color, $sort, $startMessage, $PHP_SELF, $save_as_draft, $uid_support, $enable_forward_as_attachment, $imapConnection, $lastTargetMailbox, - $data_dir, $username; + $data_dir, $username, $delete_prev_next_display; $topbar_delimiter = ' | '; $double_delimiter = '    '; @@ -577,7 +577,6 @@ function formatMenubar($mailbox, $passed_id, $passed_ent_id, $message, $mbx_resp // Only bother with Delete & Prev and Delete & Next IF // we have UID support, and top display is enabled. - $delete_prev_next_display = getPref($data_dir, $username, 'delete_prev_next_display', 1); if ( $uid_support && $delete_prev_next_display == 1 ) { $del_prev_link = _("Delete & Prev"); if ($prev >= 0) { -- 2.25.1