From b55619a76c3a93e8ce7714e948afb8df74512dda Mon Sep 17 00:00:00 2001 From: Thomas Brüderli Date: Wed, 21 Apr 2010 12:27:27 +0000 Subject: Fix disabling of the syntax converter; allow to specify the db connection charset in it_dbi --- it_auto_prepend.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'it_auto_prepend.php') diff --git a/it_auto_prepend.php b/it_auto_prepend.php index d946e78..556f167 100644 --- a/it_auto_prepend.php +++ b/it_auto_prepend.php @@ -72,7 +72,7 @@ function it_initialize() # IT_HOME is recommended variable name for applications $GLOBALS['IT_HOME'] = $GLOBALS['ULTRAHOME'] = it_untaint($GLOBALS['ULTRAHOME'], TC_ALL); - $needsconvert = !@eval("return is_array(42=>69,);"); # Check if PHP is patched to support our syntax, see http://cschneid.com/php/ + $needsconvert = $GLOBALS['IT_SYNTAXCONVERTER_DIR'] !== false && !@eval("return is_array(42=>69,);"); # Check if PHP is patched to support our syntax, see http://cschneid.com/php/ if ($needsconvert && !$GLOBALS['IT_SYNTAXCONVERTER_DIR']) { @@ -82,7 +82,7 @@ function it_initialize() die(($webmode ? "
" : "") . "Seems to be running in shared environment, manually set\n\$GLOBALS['IT_SYNTAXCONVERTER_DIR'] in $it_path/auto_prepend_local.php\nto either:\n  a) FALSE (syntax conversion disabled) or\n  b) the path to a writeable directory (NOTE: THIS IS UNSAFE!) or\n  c) install the PHP patch from http://cschneid.com/php/\n" . ($webmode ? "
" : "")); } - ini_set('include_path', $GLOBALS['IT_SYNTAXCONVERTER_DIR'] . "/it_syntaxconverter" . PATH_SEPARATOR . $it_path . PATH_SEPARATOR . $include_path); + ini_set('include_path', ($GLOBALS['IT_SYNTAXCONVERTER_DIR'] ? $GLOBALS['IT_SYNTAXCONVERTER_DIR'] . "/it_syntaxconverter" . PATH_SEPARATOR : '') . $it_path . PATH_SEPARATOR . $include_path); $user_includes = explode(PATH_SEPARATOR, $include_path); # XXX Note: Comment this out if you want system wide include path converted and auto_prepend.php considered -- cgit v1.2.3