diff options
author | Aleksander Machniak <alec@alec.pl> | 2013-01-07 15:26:02 +0100 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2013-01-07 15:26:02 +0100 |
commit | 3e3767138e2ea62aea549917c13040849036fbf3 (patch) | |
tree | ffcbdebb8c8add44eebb3e1bd896af450946b5e1 | |
parent | 745d8697ba6ff7b35bda24d9c2319a9ed848152c (diff) |
Rename $date_types -> $date_cols
-rw-r--r-- | program/lib/Roundcube/rcube_addressbook.php | 4 | ||||
-rw-r--r-- | program/lib/Roundcube/rcube_contacts.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php index ffe35097a..0411f586c 100644 --- a/program/lib/Roundcube/rcube_addressbook.php +++ b/program/lib/Roundcube/rcube_addressbook.php @@ -45,8 +45,8 @@ abstract class rcube_addressbook public $sort_col = 'name'; public $sort_order = 'ASC'; public $coltypes = array('name' => array('limit'=>1), 'firstname' => array('limit'=>1), 'surname' => array('limit'=>1), 'email' => array('limit'=>1)); + public $date_cols = array(); - protected $date_types = array(); protected $error; /** @@ -538,7 +538,7 @@ abstract class rcube_addressbook // The value is a date string, for date we'll // use only strict comparison (mode = 1) // @TODO: partial search, e.g. match only day and month - if (in_array($colname, $this->date_types)) { + if (in_array($colname, $this->date_fields)) { return (($value = rcube_utils::strtotime($value)) && ($search = rcube_utils::strtotime($search)) && date('Ymd', $value) == date('Ymd', $search)); diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php index 062bd1e19..c66e98687 100644 --- a/program/lib/Roundcube/rcube_contacts.php +++ b/program/lib/Roundcube/rcube_contacts.php @@ -45,7 +45,6 @@ class rcube_contacts extends rcube_addressbook private $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'nickname', 'jobtitle', 'organization', 'department', 'maidenname', 'email', 'phone', 'address', 'street', 'locality', 'zipcode', 'region', 'country', 'website', 'im', 'notes'); - protected $date_types = array('birthday', 'anniversary'); // public properties public $primary_key = 'contact_id'; @@ -61,6 +60,7 @@ class rcube_contacts extends rcube_addressbook 'jobtitle', 'organization', 'department', 'assistant', 'manager', 'gender', 'maidenname', 'spouse', 'email', 'phone', 'address', 'birthday', 'anniversary', 'website', 'im', 'notes', 'photo'); + public $date_cols = array('birthday', 'anniversary'); const SEPARATOR = ','; |