From 1e86a91266008a1fffa85c5b3c6af3c31b84478c Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 2 Feb 2009 15:42:43 +0000
Subject: - Patch #367711 by catch: shorten drupal_map_assoc().  Thanks
 almighty catch.

---
 includes/common.inc | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'includes')

diff --git a/includes/common.inc b/includes/common.inc
index 09bd204e4..7414fcdb6 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1883,13 +1883,9 @@ function drupal_page_footer() {
  *   An associative array.
  */
 function drupal_map_assoc($array, $function = NULL) {
-  if (!isset($function)) {
-    $result = array();
-    foreach ($array as $value) {
-      $result[$value] = $value;
-    }
-    return $result;
-  }
+  if (!isset($function) && !empty($array)) {
+    return array_combine($array, $array);
+ }
   elseif (function_exists($function)) {
     $result = array();
     foreach ($array as $value) {
-- 
cgit v1.2.3