No-brainer: Move type conversion of ['FE']['pageNotFound_handling']='true' (string...
authorMichael Stucki <michael.stucki@typo3.org>
Fri, 27 Apr 2007 21:31:10 +0000 (21:31 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Fri, 27 Apr 2007 21:31:10 +0000 (21:31 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2276 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
t3lib/config_default.php
typo3/sysext/cms/tslib/class.tslib_fe.php

index 5f96467..70404a6 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 2007-04-27  Michael Stucki  <michael@typo3.org>
 
-       * Release of TYPO3 4.2.0snapshot-20070427
+       * Move type conversion of $TYPO3_CONF_VARS['FE']['pageNotFound_handling']='true' (string) into t3lib/config_default.php
 
 2007-04-27  Ingo Renner  <typo3@ingo-renner.com>
 
index 5298740..5016140 100755 (executable)
@@ -328,6 +328,13 @@ if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_imvMaskState']) {
 }
 
 
+       // Convert type of "pageNotFound_handling" setting in case it was written as a string (e.g. if edited in Install Tool)
+       // TODO: Once the Install Tool handles such data types correctly, this workaround should be removed again...
+if (!strcasecmp($TYPO3_CONF_VARS['FE']['pageNotFound_handling'],'TRUE'))       {
+       $TYPO3_CONF_VARS['FE']['pageNotFound_handling'] = TRUE;
+}
+
+
        // simple debug function which prints output immediately
 function xdebug($var='',$br=0) {
                // If you wish to use the debug()-function, and it does not output something, please edit the IP mask in TYPO3_CONF_VARS
index 8e86419..67cb695 100755 (executable)
                        }
                }
 
-                       // Convert $code in case it was written as a string (e.g. if edited in Install Tool)
-                       // TODO: Once the Install Tool handles such data types correctly, this workaround should be removed again...
-               if (!strcasecmp($code,'TRUE'))  { $code=TRUE; }
-
                        // Create response:
                if (gettype($code)=='boolean' || !strcmp($code,1))      {       // Simply boolean; Just shows TYPO3 error page with reason:
                        $this->printError('The page did not exist or was inaccessible.'.($reason ? ' Reason: '.htmlspecialchars($reason) : ''));