From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Wed, 18 Jan 2017 14:59:57 +0000 (+0100)
Subject: Fixed an array_combine object issue.
X-Git-Tag: v2.4.2~19^2~24
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=3c1ca6e8e69a5c362ba2423c477c7e8351475563

Fixed an array_combine object issue.
---

diff --git a/includes/main.inc b/includes/main.inc
index 322a51bb..df31aa17 100644
--- 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 95e8ea16..c603ead2 100644
--- 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"),