Get rid of array_walk() when simple foreach() can be used

Aleksander Machniak

2015-07-02 8cc6b18bcda5a20e5e07f629d93ddb444d8c2e8d

Get rid of array_walk() when simple foreach() can be used

 program/lib/Roundcube/rcube_ldap.php

@@ -834,15 +834,12 @@
            }
            else {
                // map address book fields into ldap attributes
                $me         = $this;
                $attributes = array();
                $fields     = (array) $fields;

                array_walk($fields, function($field) use ($me, &$attributes) {
                    if ($me->coltypes[$field] && ($attrs = (array)$me->coltypes[$field]['attributes'])) {
                        $attributes = array_merge($attributes, $attrs);
                foreach ((array) $fields as $field) {
                    if ($this->coltypes[$field] && ($attrs = $this->coltypes[$field]['attributes'])) {
                        $attributes = array_merge($attributes, (array) $attrs);
                    }
                });
                }
            }

            // compose a full-text-like search filter