diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-02-03 12:24:41 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-02-03 12:24:41 +0000 |
| commit | ff1e4c669a64276a0d5c377bf69c1268c1fb796f (patch) | |
| tree | 0510c0272f00baa7f203a954e1b8d3c2e1306b62 /includes | |
| parent | 1e86a91266008a1fffa85c5b3c6af3c31b84478c (diff) | |
| download | brdo-ff1e4c669a64276a0d5c377bf69c1268c1fb796f.tar.gz brdo-ff1e4c669a64276a0d5c377bf69c1268c1fb796f.tar.bz2 | |
- Reverting #367711 ...
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/includes/common.inc b/includes/common.inc index 7414fcdb6..09bd204e4 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -1883,9 +1883,13 @@ function drupal_page_footer() { * An associative array. */ function drupal_map_assoc($array, $function = NULL) { - if (!isset($function) && !empty($array)) { - return array_combine($array, $array); - } + if (!isset($function)) { + $result = array(); + foreach ($array as $value) { + $result[$value] = $value; + } + return $result; + } elseif (function_exists($function)) { $result = array(); foreach ($array as $value) { |