--- trunk_orig/t3lib/class.t3lib_befunc.php 2009-08-17 17:34:49.000000000 +0200
+++ trunk/t3lib/class.t3lib_befunc.php 2009-08-25 17:48:04.000000000 +0200
@@ -4029,7 +4029,7 @@
public static function displayWarningMessages() {
if ($GLOBALS['BE_USER']->isAdmin()) {
$warnings = array(); // Array containing warnings that must be displayed
- $enableInstallToolFile = PATH_site.'typo3conf/ENABLE_INSTALL_TOOL'; // If this file exists, the Install Tool is enabled
+ $enableInstallToolFile = PATH_site . 'typo3conf/ENABLE_INSTALL_TOOL'; // If this file exists and it isn't older than one hour, the Install Tool is enabled
$cmd = t3lib_div::_GET('adminWarning_cmd'); // Cleanup command, if set
switch($cmd) {
@@ -4062,7 +4062,8 @@
}
$GLOBALS['TYPO3_DB']->sql_free_result($res);
- if (@is_file($enableInstallToolFile)) {
+ // Check whether the file ENABLE_INSTALL_TOOL contains the string "KEEP_FILE" which permanently unlocks the install tool
+ if (is_file($enableInstallToolFile) && trim(file_get_contents($enableInstallToolFile)) === 'KEEP_FILE') {
$url = t3lib_div::getIndpEnv('TYPO3_REQUEST_SCRIPT').'?adminWarning_cmd=remove_ENABLE_INSTALL_TOOL';
$warnings['install_enabled'] = sprintf(
$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:warning.install_enabled'),
--- typo3/sysext/lang/locallang_core.xml 2009-08-07 21:32:36.000000000 +0200
+++ typo3/sysext/lang/locallang_core.xml 2009-08-17 17:50:16.000000000 +0200
@@ -241,7 +241,7 @@
-
+