Missed a few index->UID conversions

diff --git a/imp/message.php b/imp/message.php
index 4e64dc7..718c277 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -347,8 +347,8 @@ ksort($full_headers);
 
 /* For the self URL link, we can't trust the index in the query string as it
  * may have changed if we deleted/copied/moved messages. We may need other
- * stuff in the query string, so we need to do an add/remove of 'index'. */
-$selfURL = Horde_Util::removeParameter(Horde::selfUrl(true), array('index', 'actionID', 'mailbox', 'thismailbox'));
+ * stuff in the query string, so we need to do an add/remove of 'uid'. */
+$selfURL = Horde_Util::removeParameter(Horde::selfUrl(true), array('actionID', 'mailbox', 'thismailbox', 'uid'));
 $selfURL = IMP::generateIMPUrl($selfURL, $imp_mbox['mailbox'], $uid, $mailbox_name);
 IMP::$newUrl = $selfURL = html_entity_decode(Horde_Util::addParameter($selfURL, 'message_token', $message_token));
 $headersURL = htmlspecialchars(Horde_Util::removeParameter($selfURL, array('show_all_headers', 'show_list_headers')));

diff --git a/imp/templates/message/navbar_top.html b/imp/templates/message/navbar_top.html
index 3d76eca..c8f66fe 100644 (file)
--- a/imp/templates/message/navbar_top.html
+++ b/imp/templates/message/navbar_top.html
@@ -6,7 +6,7 @@
 <input type="hidden" name="mailbox" value="<tag:mailbox />" />
 <input type="hidden" name="thismailbox" value="<tag:thismailbox />" />
 <input type="hidden" name="start" value="<tag:start />" />
-<input type="hidden" name="index" value="<tag:index />" />
+<input type="hidden" name="uid" value="<tag:uid />" />
 <input type="hidden" id="newMbox" name="newMbox" />
 <input type="hidden" name="flag" />
 <h1 class="header">