Fixed an array_combine object issue.

diff --git a/includes/main.inc b/includes/main.inc
index 322a51bb8ee442e14eb77aa628534afe0cfd0e7e..df31aa17a52a4e84d4ea6a0e968fdbc7ebe56d30 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -418,7 +418,7 @@ if (!function_exists('array_fill_keys')) // since 5.2
 {
        function array_fill_keys($keys, $value)
        {
-               return array_combine($keys, array_fill(count($keys), $value));
+               return (object)array_combine($keys, array_fill(count($keys), $value));
        }
 }
 

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 95e8ea1692a606bd57d060af5adb26edb07872fc..c603ead26d027375729832139fc12beebe36c382 100644 (file)
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -2535,7 +2535,7 @@ function payment_services($name)
 {
        global $payment_services;
 
-       $services = array_combine(array_keys($payment_services), array_keys($payment_services));
+       $services = (object)array_combine(array_keys($payment_services), array_keys($payment_services));
 
        return array_selector($name, null, $services, array(
                        'spec_option'=> _("No payment Link"),