aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-09-21 18:13:09 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-09-21 18:13:09 +0200
commit6c038d04991d1474916edccce7291d8f4f8a9210 (patch)
tree591eb3f489e0d13c09a6b754c09672c04e323497 /phpBB
parente41f9c932970c81908f28735e0478510f6d1215b (diff)
parente95aec163789cc333c39d2dd9c8432da3c428102 (diff)
downloadforums-6c038d04991d1474916edccce7291d8f4f8a9210.tar
forums-6c038d04991d1474916edccce7291d8f4f8a9210.tar.gz
forums-6c038d04991d1474916edccce7291d8f4f8a9210.tar.bz2
forums-6c038d04991d1474916edccce7291d8f4f8a9210.tar.xz
forums-6c038d04991d1474916edccce7291d8f4f8a9210.zip
Merge remote-tracking branch 'cs278/ticket/10152' into develop
* cs278/ticket/10152: [ticket/10152] Remove end '?>' from generated config.php.
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/install/install_install.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index db763f7a7c..f8c54678bf 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -903,7 +903,6 @@ class install_install extends module
$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
$config_data .= "// @define('DEBUG', true);\n";
$config_data .= "// @define('DEBUG_EXTRA', true);\n";
- $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...
if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && phpbb_is_writable($phpbb_root_path . 'config.' . $phpEx)) || phpbb_is_writable($phpbb_root_path))