From ab2a1160b71a5fcfac1ecde12574ce77c75b86de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 14 Mar 2006 21:17:10 +0000 Subject: [PATCH] Fix config loading (bug #1449821). --- ChangeLog | 1 + scripts/setup.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a8fc722e..5f1ef9eb5 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2006-03-14 Michal Čihař * lang/czech: Update, use binary prefixes. * lang/english: Nothing to translate here. + * scripts/setup.php: Fix config loading (bug #1449821). 2006-03-14 Alexander M. Turek * lang/german-*.inc.php: Use correct binary prefixes for byte units. diff --git a/scripts/setup.php b/scripts/setup.php index e6f8f81d8..e57947ec8 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -1110,10 +1110,10 @@ function load_config($config_file) { $success_apply_user_config = FALSE; $old_error_reporting = error_reporting( 0 ); if ( function_exists( 'file_get_contents' ) ) { - $success_apply_user_config = eval( '?>' . file_get_contents( $config_file ) ); + $success_apply_user_config = eval('?>' . trim(file_get_contents($config_file))); } else { $success_apply_user_config = - eval( '?>' . implode( '\n', file( $config_file ) ) ); + eval('?>' . trim(implode("\n", file($config_file)))); } error_reporting( $old_error_reporting ); unset( $old_error_reporting );