Changeset c1d27d8 in github

Timestamp:

Jan 8, 2012 5:57:49 AM (17 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

43ff347

Parents:

88dcd00

Message:

• Fix setting pagesizes (#1488295)

File:

• program/steps/settings/save_prefs.inc (modified) (2 diffs)

program/steps/settings/save_prefs.inc

@@ -150 +150 @@
       $OUTPUT->command('reload', 500);
 
-    // force min size
-    if ($a_user_prefs['mail_pagesize'] < 1)
-      $a_user_prefs['mail_pagesize'] = 10;
-    if ($a_user_prefs['addressbook_pagesize'] < 1)
-      $a_user_prefs['addressbook_pagesize'] = 10;
-
-    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize']))
-      $a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];
-    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize']))
-      $a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];
-
     $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];
 
@@ -172 +161 @@
         $a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
     }
+
+    // force min size
+    if ($a_user_prefs['mail_pagesize'] < 1)
+      $a_user_prefs['mail_pagesize'] = 10;
+
+    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['mail_pagesize'] > $CONFIG['max_pagesize']))
+      $a_user_prefs['mail_pagesize'] = (int) $CONFIG['max_pagesize'];
+
+  break;
+  case 'addressbook':
+
+    // force min size
+    if ($a_user_prefs['addressbook_pagesize'] < 1)
+      $a_user_prefs['addressbook_pagesize'] = 10;
+
+    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['addressbook_pagesize'] > $CONFIG['max_pagesize']))
+      $a_user_prefs['addressbook_pagesize'] = (int) $CONFIG['max_pagesize'];
 
   break;