The DMN Option was not working correctly, the preference was only being loaded in...

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

diff --git a/include/load_prefs.php b/include/load_prefs.php
index a565873515cd2ca1433ae12eb8bc346c345fb1d1..ace9d8ee4899bf89776067f516d36ba3bb89d4f3 100644 (file)
--- 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 77d6020dc9c06c624bca45c16df1d8d1a8fde28e..916df1679ecc14e2ac9c91b5bf559bd2ec68f83a 100644 (file)
--- 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) {