[BUGFIX] Do not show System Extensions Wizard when done
[Packages/TYPO3.CMS.git] / typo3 / sysext / install / Classes / CoreUpdates / InstallSysExtsUpdate.php
index bea4889..bee09a6 100644 (file)
@@ -4,9 +4,9 @@ namespace TYPO3\CMS\Install\CoreUpdates;
 /***************************************************************
  *  Copyright notice
  *
- *  (c) 2008-2011 Benjamin Mack <benni@typo3.org>
- *  (c) 2008-2011 Steffen Kamper <info@sk-typo3.de>
- *  (c) 2012 Kai Vogel <kai.vogel@speedprogs.de>
+ *  (c) 2008-2013 Benjamin Mack <benni@typo3.org>
+ *  (c) 2008-2013 Steffen Kamper <info@sk-typo3.de>
+ *  (c) 2012-2013 Kai Vogel <kai.vogel@speedprogs.de>
  *  All rights reserved
  *
  *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -165,10 +165,10 @@ class InstallSysExtsUpdate extends \TYPO3\CMS\Install\Updates\AbstractUpdate {
         */
        public function performUpdate(array &$dbQueries, &$customMessages) {
                        // Get extension keys that were submitted by the user to be installed and that are valid for this update wizard
-               if (is_array($this->pObj->INSTALL['update']['installSystemExtensions']['sysext'])) {
+               if (is_array($this->userInput['sysext'])) {
                        $extArray = array_intersect(
                                $this->systemExtensions,
-                               array_keys($this->pObj->INSTALL['update']['installSystemExtensions']['sysext'])
+                               array_keys($this->userInput['sysext'])
                        );
                        $this->installExtensions($extArray, $customMessages);
                }
@@ -338,7 +338,7 @@ class InstallSysExtsUpdate extends \TYPO3\CMS\Install\Updates\AbstractUpdate {
                $wizardClassName = get_class($this);
                if (!empty($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone'][$wizardClassName])) {
                        $seenExtensions = json_decode($GLOBALS['TYPO3_CONF_VARS']['INSTALL']['wizardDone'][$wizardClassName], TRUE);
-                       return (bool) array_diff($this->systemExtensions, $seenExtensions);
+                       return count(array_diff($this->systemExtensions, $seenExtensions)) === 0;
                }
                return FALSE;
        }