summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2007-08-10 13:51:53 +0000
committerthomascube <thomas@roundcube.net>2007-08-10 13:51:53 +0000
commitfc73746eb48c4b3bfad9ee04f1fb229788062ffc (patch)
tree9cb13d53c29777794f4570870281b8c296fc2efe /program
parentb48bd06c0f0d0258777b3870f8b8f18aa8a48355 (diff)
Fix compose function from address book + mozilla compatibility
Diffstat (limited to 'program')
-rw-r--r--program/js/app.js2
-rw-r--r--program/steps/addressbook/mailto.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 78e2b1afa..48597c57d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2289,7 +2289,7 @@ function rcube_webmail()
this.enable_command('delete', 'compose', false);
// send request to server
- var url = (src ? '&_source='+urlencode(src) : '') + (page ? '&_page='+page : '');
+ var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
this.env.source = src;
// also send search request to get the right messages
diff --git a/program/steps/addressbook/mailto.inc b/program/steps/addressbook/mailto.inc
index 27217e5c8..101b7c043 100644
--- a/program/steps/addressbook/mailto.inc
+++ b/program/steps/addressbook/mailto.inc
@@ -25,6 +25,8 @@ $mailto = array();
if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && $CONTACTS->ready)
{
+ $CONTACTS->set_page(1);
+ $CONTACTS->set_pagesize(100);
$recipients = $CONTACTS->search($CONTACTS->primary_key, $cid);
while (is_object($recipients) && ($rec = $recipients->iterate()))