From 2c16303759c4fbb183d6249e05489214f23afe4d Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Thu, 10 Jun 2010 15:39:35 +0000
Subject: [PATCH] better support for new meta HTML

---
 lam/lib/baseModule.inc | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 4c774530..c8a18e34 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -648,9 +648,23 @@ abstract class baseModule {
 	public function get_configOptions($scopes, $allScopes) {
 		$return = array();
 		for ($i = 0; $i < sizeof($scopes); $i++) {
-			if (isset($this->meta['config_options'][$scopes[$i]])) $return = array_merge($return, $this->meta['config_options'][$scopes[$i]]);
+			if (isset($this->meta['config_options'][$scopes[$i]])) {
+				if (is_array($this->meta['config_options'][$scopes[$i]])) {
+					$return = array_merge($return, $this->meta['config_options'][$scopes[$i]]);
+				}
+				else {
+					$return[] = $this->meta['config_options'][$scopes[$i]];
+				}
+			}
+		}
+		if (isset($this->meta['config_options']['all'])) {
+			if (is_array($this->meta['config_options']['all'])) {
+				$return = array_merge($return, $this->meta['config_options']['all']);
+			}
+			else {
+				$return[] = $this->meta['config_options']['all'];
+			}
 		}
-		if (isset($this->meta['config_options']['all'])) $return = array_merge($return, $this->meta['config_options']['all']);
 		return $return;
 	}
 
@@ -1247,8 +1261,12 @@ abstract class baseModule {
 	 * @see parseHtml()
 	 */
 	public function getSelfServiceSettings() {
-		if (isset($this->meta['selfServiceSettings']) && is_array($this->meta['selfServiceSettings'])) return $this->meta['selfServiceSettings'];
-		else return array();
+		if (isset($this->meta['selfServiceSettings'])) {
+			return $this->meta['selfServiceSettings'];
+		}
+		else {
+			return array();
+		}
 	}
 
 	/**