Changeset b1f0846 in github

Timestamp:

Oct 7, 2011 4:33:24 AM (20 months ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

fb40f37

Parents:

8fb04be

Message:

• Make sure LDAP name fields aren't arrays (#1488108)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (3 diffs)
• program/steps/mail/search.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Make sure LDAP name fields aren't arrays (#1488108)
 - Fixed imap test to non-default port when using ssl (#1488118)
 - Force all files to be overwritten when updating (#1488117)

program/include/rcube_ldap.php

@@ -73 +73 @@
     {
         $this->prop = $p;
-        
+
         if (isset($p['searchonly']))
             $this->searchonly = $p['searchonly'];
@@ -448 +448 @@
             return $this->result;
         }
-        
+
         // add general filter to query
         if (!empty($this->prop['filter']) && empty($this->filter))
@@ -1032 +1032 @@
                     $out[$rf] = $value;
             }
+
+            // Make sure name fields aren't arrays (#1488108)
+            if (is_array($out[$rf]) && in_array($rf, array('name', 'surname', 'firstname', 'middlename', 'nickname'))) {
+                $out[$rf] = $out[$rf][0];
+            }
         }
 

program/steps/mail/search.inc

@@ -79 +79 @@
         default:     $subject[$header] = 'HEADER '.strtoupper($header);
       }
-    
+
     // save search modifiers for the current folder to user prefs
     $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);