summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-12-30 07:20:53 +0000
committeralecpl <alec@alec.pl>2011-12-30 07:20:53 +0000
commita61ccea31aeef274535c420831e4b8ce2c98a7e0 (patch)
treeb5daacc4c54f13cb2d8cc4abb49901f593538cf7 /program
parent08ffd939a7530c44cd68b455f75175f79698073c (diff)
- Small fixes to r5662
Diffstat (limited to 'program')
-rw-r--r--program/steps/settings/func.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 91543ec85..2050b9331 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -367,13 +367,15 @@ function rcmail_user_prefs($current=null)
}
// show page size selection
- if (!isset($no_override['pagesize'])) {
- $field_id = 'rcmfd_pagesize';
- $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+ if (!isset($no_override['mail_pagesize'])) {
+ $field_id = 'rcmfd_mail_pagesize';
+ $input_pagesize = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
+
+ $size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);
$blocks['main']['options']['pagesize'] = array(
'title' => html::label($field_id, Q(rcube_label('pagesize'))),
- 'content' => $input_pagesize->show($config['pagesize']),
+ 'content' => $input_pagesize->show($size ? $size : 50),
);
}
@@ -694,11 +696,11 @@ function rcmail_user_prefs($current=null)
$field_id = 'rcmfd_addressbook_pagesize';
$input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
- $size = $config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize'];
+ $size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);
$blocks['main']['options']['pagesize'] = array(
'title' => html::label($field_id, Q(rcube_label('pagesize'))),
- 'content' => $input_pagesize->show((int)$size),
+ 'content' => $input_pagesize->show($size ? $size : 50),
);
}