[FOLLOWUP][TASK] Add composer mode to the application information panel 22/43922/2
authorNicole Cordes <typo3@cordes.co>
Thu, 8 Oct 2015 23:25:51 +0000 (01:25 +0200)
committerNicole Cordes <typo3@cordes.co>
Thu, 8 Oct 2015 23:32:08 +0000 (01:32 +0200)
Resolves: #70518
Releases: master
Change-Id: I89447272228bff9cdccd09617b2b9b4bfe16db92
Reviewed-on: http://review.typo3.org/43922
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
typo3/sysext/lang/locallang_core.xlf

index 79283f2..79c355f 100644 (file)
@@ -114,7 +114,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
         $this->getPhpVersion();
         $this->getDatabase();
         $this->getApplicationContext();
-        $this->getClassLoaderMode();
+        $this->getComposerMode();
         $this->getGitRevision();
         $this->getOperatingSystem();
 
@@ -185,18 +185,18 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
     }
 
     /**
-     * Adds the class loading mode (Composer/TYPO3) to the displayed systen information
-     *
-     * @return void
+     * Adds the information if the Composer mode is enabled or disabled to the displayed system information
      */
-    protected function getClassLoaderMode()
+    protected function getComposerMode()
     {
+        if (!Bootstrap::usesComposerClassLoading()) {
+            return;
+        }
+
         $languageService = $this->getLanguageService();
         $this->systemInformation[] = array(
             'title' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:toolbarItems.sysinfo.composerMode', true),
-            'value' => Bootstrap::usesComposerClassLoading()
-                ? $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.enabled', true)
-                : $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.disabled', true),
+            'value' => $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.enabled', true),
             'icon' => '<span class="fa fa-music"></span>'
         );
     }
index e134c58..f9707eb 100644 (file)
@@ -181,9 +181,6 @@ Do you want to continue WITHOUT saving?</source>
                        <trans-unit id="labels.enabled">
                                <source>Enabled</source>
                        </trans-unit>
-                       <trans-unit id="labels.disabled">
-                               <source>Disabled</source>
-                       </trans-unit>
                        <trans-unit id="labels.show">
                                <source>Show</source>
                        </trans-unit>