summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-10-01 07:39:02 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-10-01 07:39:02 +0000
commit58c13bf91a1bf00f675b33e37956a7a46b340f01 (patch)
treef937da532a197f52fc128db54a6ec6487eeb20e0
parent030b3dbe9a0974509f672170485944e54482be58 (diff)
- Fix return to first page from e-mail screen (#1486105)
git-svn-id: https://svn.roundcube.net/trunk@3004 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/js/app.js6
2 files changed, 4 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 561bb60a7..9ea85f052 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix return to first page from e-mail screen (#1486105)
- Fix handling HTML comments in HTML messages (#1486189)
- Fix folder/messagelist controls alignment - icons used (#1486072)
- Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index d6fff123b..91d0f13b4 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -1629,15 +1629,15 @@ function rcube_webmail()
// also send search request to get the right messages
if (this.env.search_request)
add_url += '&_search='+this.env.search_request;
-
+
// set page=1 if changeing to another mailbox
- if (!page)
+ if (!page && this.env.mailbox != mbox)
{
page = 1;
this.env.current_page = page;
this.show_contentframe(false);
}
-
+
if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
add_url += '&_refresh=1';