From 70ec1a9b3025036c9d70da4c5d1525dc3078cfb8 Mon Sep 17 00:00:00 2001 From: Oliver Hader Date: Mon, 29 Dec 2008 11:55:53 +0000 Subject: [PATCH] Follow-up to bugfix #10004: Tweak corrections to update wizard for installing new system extensions git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4620 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 4 +++ .../class.tx_coreupdates_installsysexts.php | 26 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28ab088ec107..84333c1993db 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-12-29 Oliver Hader + + * Follow-up to bugfix #10004: Tweak corrections to update wizard for installing new system extensions + 2008-12-27 Steffen Kamper * Fixed bug #10004: Extend UpdateWizard for install systemextensions diff --git a/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php b/typo3/sysext/install/updates/class.tx_coreupdates_installsysexts.php index 284ae87a68a9..4b3c6ed44bed 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', 'fe_edit', '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 = 'Install the following SystemExtensions:




'; - + 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 -- 2.20.1