[TASK] Add note about AdditionalConfiguration.php to Install Tool 09/35409/5
authorMarkus Klein <klein.t3@reelworx.at>
Sun, 14 Dec 2014 12:21:36 +0000 (13:21 +0100)
committerAlexander Opitz <opitz.alexander@googlemail.com>
Sun, 14 Dec 2014 13:51:42 +0000 (14:51 +0100)
Add a note to clarify that AdditionalConfiguration.php is always
overruling any setting made within the Install Tool.

Furthermore we add a note to the ConfigurationManager that it is limited
to Core internal usage only.

Resolves: #60650
Releases: master, 6.2
Change-Id: Icaf7d4b1ce5b14ad0618e38e92a49a33405997f7
Reviewed-on: http://review.typo3.org/35409
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
typo3/sysext/install/Resources/Private/Templates/Action/Tool/AllConfiguration.html
typo3/sysext/install/Resources/Private/Templates/Action/Tool/Configuration.html

index a4a775d..4083dcc 100644 (file)
@@ -27,7 +27,13 @@ use TYPO3\CMS\Core\Utility\OpcodeCacheUtility;
  * - typo3conf/LocalConfiguration.php (overrides of TYPO3_CONF_VARS)
  * - typo3conf/AdditionalConfiguration.php (optional additional local code blocks)
  *
+ * IMPORTANT:
+ *   This class is intended for internal core use ONLY.
+ *   Extensions should usually use the resulting $GLOBALS['TYPO3_CONF_VARS'] array,
+ *   do not try to modify settings in LocalConfiguration.php with an extension.
+ *
  * @author Helge Funk <helge.funk@e-net.info>
+ * @internal
  */
 class ConfigurationManager {
 
index 3699228..88292f3 100644 (file)
                <f:else>
                        <h3>Change configuration values</h3>
 
+                       <p>
+                               Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
+                               is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
+                               must maintain AdditionalConfiguration.php on their own and should use it with care.
+                       </p>
+
                        <form method="post">
                                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
 
@@ -58,4 +64,4 @@
                </f:else>
        </f:if>
 
-</f:section>
\ No newline at end of file
+</f:section>
index e9c63df..6ba3a1f 100644 (file)
                The application context can then be accessed e.g. in the AdditionalConfiguration.php file or
                TypoScript configuration to customize settings accordingly.
        </p>
+       <p>
+               Changed values are written to LocalConfiguration.php. The optional file AdditionalConfiguration.php
+               is not controlled by the TYPO3 CMS core and may override single settings again. Administrators
+               must maintain AdditionalConfiguration.php on their own and should use it with care.
+       </p>
        <form method="post">
                <f:render partial="Action/Common/HiddenFormFields" arguments="{_all}" />
 
@@ -34,4 +39,4 @@
                </div>
 
        </form>
-</f:section>
\ No newline at end of file
+</f:section>