From 24bd5bee4f5c1fd8a06385971996e0dc439c76d1 Mon Sep 17 00:00:00 2001
From: steffenk <steffenk@709f56b5-9817-0410-a4d7-c38de5d9e867>
Date: Thu, 24 Feb 2011 19:16:22 +0000
Subject: [PATCH 1/1] Fixed bug #13310: PHP Warning "array_merge(): Argument #2
 is not an array" in class.tx_em_settings.php

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10621 709f56b5-9817-0410-a4d7-c38de5d9e867
---
 ChangeLog                                                 | 1 +
 typo3/sysext/em/classes/settings/class.tx_em_settings.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 42fd41600025..374d8689d38d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2011-02-24  Steffen Kamper  <steffen@typo3.org>
 
+	* Fixed bug #13310: PHP Warning "array_merge(): Argument #2 is not an array" in class.tx_em_settings.php
 	* Renewed fix #17701: Generated t3x are corrupted in 4.5.1-dev and trunk
 
 2011-02-23  Oliver Hader  <oliver.hader@typo3.org>
diff --git a/typo3/sysext/em/classes/settings/class.tx_em_settings.php b/typo3/sysext/em/classes/settings/class.tx_em_settings.php
index e73fb0060ccb..0af122132f2e 100644
--- a/typo3/sysext/em/classes/settings/class.tx_em_settings.php
+++ b/typo3/sysext/em/classes/settings/class.tx_em_settings.php
@@ -99,6 +99,13 @@ class tx_em_Settings implements t3lib_Singleton {
 	 */
 	protected function readSettings() {
 		$globalSettings = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['em']);
+		if (!is_array($globalSettings)) {
+			$globalSettings = array(
+				'displayMyExtensions' => 0,
+				'selectedLanguages' => array(),
+				'inlineToWindow' => 1,
+			);
+		}
 		$this->MOD_MENU = array(
 			'function' => array(
 				'loaded_list' => $GLOBALS['LANG']->getLL('menu_loaded_extensions'),
-- 
2.20.1