From ff1e4c669a64276a0d5c377bf69c1268c1fb796f Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Tue, 3 Feb 2009 12:24:41 +0000
Subject: - Reverting #367711 ...

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

(limited to 'includes')

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) {
-- 
cgit v1.2.3