From 51365279779cc2dcc6b4e2b3f5c53e8bdf0361dc Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 5 Mar 2010 19:26:07 +0100
Subject: [PATCH] The shortcut is still needed because array_combine() fails
 with empty arrays.

---
 framework/Util/lib/Horde/Array.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/framework/Util/lib/Horde/Array.php b/framework/Util/lib/Horde/Array.php
index 1184bef52..4d138eb6e 100644
--- 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);
     }
 
-- 
2.11.0