[BUGFIX] Only show download location as configured
authorJigal van Hemert <jigal@xs4all.nl>
Wed, 17 Oct 2012 21:13:51 +0000 (23:13 +0200)
committerHelmut Hummel <helmut.hummel@typo3.org>
Wed, 17 Oct 2012 21:43:46 +0000 (23:43 +0200)
Extension manager shows possible locations to install an Extension.
The options set in the Install Tool must be shown.

Change-Id: I6d51c1a71eb4ff83077cf3962fadbcefb5049637
Fixes: #42103
Releases: 6.0
Reviewed-on: http://review.typo3.org/15778
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Helmut Hummel
Tested-by: Helmut Hummel
typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php

index 3d49e31..af8190b 100644 (file)
@@ -461,9 +461,15 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
         */
        static public function returnAllowedInstallPaths() {
                $installPaths = self::returnInstallPaths();
-               if (!(isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['allowSystemInstall']) && $GLOBALS['TYPO3_CONF_VARS']['EXT']['allowSystemInstall'])) {
+               if (empty($GLOBALS['TYPO3_CONF_VARS']['EXT']['allowSystemInstall'])) {
                        unset($installPaths['System']);
                }
+               if (empty($GLOBALS['TYPO3_CONF_VARS']['EXT']['allowGlobalInstall'])) {
+                       unset($installPaths['Global']);
+               }
+               if (empty($GLOBALS['TYPO3_CONF_VARS']['EXT']['allowLocalInstall'])) {
+                       unset($installPaths['Local']);
+               }
                return $installPaths;
        }