summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc10
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) {