Merge pull request #15 from lars85/master

[BUGFIX] Concatenate arrays instead of merging

Author: etobi

Classes/Service/CacheApiService.php

@@ -39,8 +39,16 @@ class Tx_Coreapi_Service_CacheApiService {
 	 *
 	 */
 	public function initializeObject() {
+		// Create a fake admin user
+		$adminUser = new t3lib_beUserAuth();
+		$adminUser->user['uid'] = $GLOBALS['BE_USER']->user['uid'];
+		$adminUser->user['username'] = '_CLI_lowlevel';
+		$adminUser->user['admin'] = 1;
+		$adminUser->workspace = 0;
+
 		$this->tce = t3lib_div::makeInstance('t3lib_TCEmain');
 		$this->tce->start(Array(), Array());
+		$this->tce->start(Array(), Array(), $adminUser);
 	}
 
 	/**

Classes/Service/DatabaseApiService.php

@@ -183,19 +183,21 @@ protected function getRequestKeys(array $update, array $remove) {
 
 		foreach ($updateActions as $updateAction) {
 			if (isset($update[$updateAction]) && is_array($update[$updateAction])) {
-				$tmpKeys += array_keys($update[$updateAction]);
+				$tmpKeys[] = array_keys($update[$updateAction]);
 			}
 		}
 
 		foreach ($removeActions as $removeAction) {
 			if (isset($remove[$removeAction]) && is_array($remove[$removeAction])) {
-				$tmpKeys += array_keys($remove[$removeAction]);
+				$tmpKeys[] = array_keys($remove[$removeAction]);
 			}
 		}
 
 		$finalKeys = array();
-		foreach ($tmpKeys as $key) {
-			$finalKeys[$key] = TRUE;
+		foreach ($tmpKeys as $keys) {
+			foreach ($keys as $key) {
+				$finalKeys[$key] = TRUE;
+			}
 		}
 		return $finalKeys;
 	}