Changeset 08ffd939 in github for program/include/rcmail.php

Timestamp:

Dec 29, 2011 4:35:01 AM (17 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

a61ccea

Parents:

81c2ce9

Message:

• Add separate pagesize setting for mail messages and contacts (#1488269)

File:

• program/include/rcmail.php (modified) (3 diffs)

program/include/rcmail.php

@@ -599 +599 @@
 
     // enable caching of imap data
-    $imap_cache = $this->config->get('imap_cache');
+    $imap_cache     = $this->config->get('imap_cache');
     $messages_cache = $this->config->get('messages_cache');
     // for backward compatybility
@@ -606 +606 @@
         $messages_cache = true;
     }
+
     if ($imap_cache)
         $this->imap->set_caching($imap_cache);
@@ -612 +613 @@
 
     // set pagesize from config
-    $this->imap->set_pagesize($this->config->get('pagesize', 50));
-
-    // Setting root and delimiter before establishing the connection
-    // can save time detecting them using NAMESPACE and LIST
+    $pagesize = $this->config->get('mail_pagesize');
+    if (!$pagesize) {
+        $pagesize = $this->config->get('pagesize', 50);
+    }
+    $this->imap->set_pagesize($pagesize);
+
+    // set connection options
     $options = array(
       'auth_type'   => $this->config->get('imap_auth_type', 'check'),