summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-02-02 15:42:43 +0000
committerDries Buytaert <dries@buytaert.net>2009-02-02 15:42:43 +0000
commit1e86a91266008a1fffa85c5b3c6af3c31b84478c (patch)
tree4072b32be590274d8f07c12adac1dba7499fb020
parent643ad121a63849ded59fa86c5292997e2ccc59ae (diff)
downloadbrdo-1e86a91266008a1fffa85c5b3c6af3c31b84478c.tar.gz
brdo-1e86a91266008a1fffa85c5b3c6af3c31b84478c.tar.bz2
- Patch #367711 by catch: shorten drupal_map_assoc(). Thanks almighty catch.
-rw-r--r--includes/common.inc10
1 files changed, 3 insertions, 7 deletions
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) {