rc2: program/include/rcmail.php comparison

more compensation for deprecated empty cases

comparison

equal deleted inserted replaced

-:bea5a38be938
+:c32b53434b47
 * @return rcube_contacts Address book object
 */
 public function get_address_book($id, $writeable = false)
 {
 $contacts    = null;
+	$default = false;
 $ldap_config = (array)$this->config->get('ldap_public');
 // 'sql' is the alias for '0' used by autocomplete
 if ($id == 'sql')
 $id = '0';
 if ($pos !== false) {
 $subFolders    = substr($folder, $pos+1);
 $currentFolder = substr($folder, 0, $pos);
 // sometimes folder has a delimiter as the last character
-if (!strlen($subFolders)) {
+if (empty($subFolders)) {
 $virtual = false;
 }
 else if (!isset($arrFolders[$currentFolder])) {
 $virtual = true;
 }
 if (is_string($_uid))
 $_uid = explode(',', $_uid);
 // create a per-folder UIDs array
 foreach ((array)$_uid as $uid) {
-list($uid, $mbox) = explode('-', $uid, 2);
+	      list($uid, $mbox) = array_pad(explode('-', $uid, 2), 2, "");
-if (!strlen($mbox)) {
+if (empty($mbox)) {
 $mbox = $_mbox;
 }
 else {
 $is_multifolder = true;
 }

Mercurial > hg > rc2