Merge branch 'dev'

1 files changed, 6 insertions, 1 deletions

diff --git a/util/service_class b/util/service_class
index 50f01afff..b8a1f2386 100755
--- a/util/service_class
+++ b/util/service_class
@@ -93,7 +93,12 @@ if($argc == 1) {
 	if(is_array(App::$config['service_class']) && App::$config['service_class']) {
 		foreach(App::$config['service_class'] as $class=>$props) {
 			echo "$class:\n";
-			$d = unserialize($props);
+
+			$d = ((! is_array($props)) && (preg_match('|^a:[0-9]+:{.*}$|s', $props))
+				? unserialize($props)
+				: $props
+			);
+
 			if(is_array($d) && $d) {
 				foreach($d as $k => $v) {
 					echo "\t$k = $v\n";