The shortcut is still needed because array_combine() fails with empty arrays.

diff --git a/framework/Util/lib/Horde/Array.php b/framework/Util/lib/Horde/Array.php
index 1184bef..4d138eb 100644 (file)
--- a/framework/Util/lib/Horde/Array.php
+++ b/framework/Util/lib/Horde/Array.php
@@ -193,6 +193,9 @@ class Horde_Array
      */
     static public function valuesToKeys($array)
     {
+        if (!$array) {
+            return array();
+        }
         return array_combine($array, $array);
     }