X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/blobdiff_plain/66dddf50552e2f39757eb58f21e2794588a544e5..70ec1a9b3025036c9d70da4c5d1525dc3078cfb8:/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php

diff --git a/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php b/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php
index 779195653bc..4b3c6ed44be 100644
--- a/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php
+++ b/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php
@@ -36,8 +36,8 @@
  */
 class tx_coreupdates_installsysexts {
 	public $versionNumber;	// version number coming from t3lib_div::int_from_ver()
-    public $newSystemExtensions = array('about', 'cshmanual', 'feedit', 'simulatestatic');
-    
+	protected $newSystemExtensions = array('about', 'cshmanual', 'fe_edit', 'simulatestatic');
+
 	/**
 	 * parent object
 	 *
@@ -76,13 +76,12 @@ class tx_coreupdates_installsysexts {
 	 * @return	string		HTML output
 	 */
 	public function getUserInput($inputPrefix) {
-	
 		$content = '<strong>Install the following SystemExtensions</strong>:<br />
 		<input type="checkbox" id="about" name="' . $inputPrefix . '[sysext][about]" value="1" checked="checked" /><label for="about">Help&gt;About [about]</label><br />		
 		<input type="checkbox" id="cshmanual" name="' . $inputPrefix . '[sysext][cshmanual]" value="1" checked="checked" /><label for="cshmanual">Help&gt;TYPO3 Manual [cshmanual]</label><br />
 		<input type="checkbox" id="fe_edit" name="' . $inputPrefix . '[sysext][fe_edit]" value="1" checked="checked" /><label for="fe_edit">Frontend Editing [fe_edit]</label><br />
 		<input type="checkbox" id="simulatestatic" name="' . $inputPrefix . '[sysext][simulatestatic]" value="1" checked="checked" /><label for="simulatestatic">Simulate Static URLs [simulatestatic]</label><br />';
-		
+
 		return $content;
 	}
 
@@ -95,13 +94,20 @@ class tx_coreupdates_installsysexts {
 	 */
 	public function performUpdate(&$dbQueries, &$customMessages) {
 		$result = false;
-		$extArray = (array) array_keys($this->pObj->INSTALL['update']['installSystemExtensions']['sysext']);
 
-		$extList = $this->addExtToList($extArray);
-		if ($extList) {
-			$this->writeNewExtensionList($extList);
-			$result = true;
+		// Get extension keys that were submitted by the used to be installed and that are valid for this update wizard:
+		if (is_array($this->pObj->INSTALL['update']['installSystemExtensions']['sysext'])) {
+			$extArray = array_intersect(
+				$this->newSystemExtensions,
+				array_keys($this->pObj->INSTALL['update']['installSystemExtensions']['sysext'])
+			);
+			$extList = $this->addExtToList($extArray);
+			if ($extList) {
+				$this->writeNewExtensionList($extList);
+				$result = true;
+			}
 		}
+
 		return $result;
 	}
 
@@ -145,4 +151,4 @@ class tx_coreupdates_installsysexts {
 		t3lib_extMgm::removeCacheFiles();
 	}
 }
-?>
+?>
\ No newline at end of file