1 files changed, 1 insertions, 31 deletions
diff --git a/phpBB/includes/core/bootstrap.php b/phpBB/includes/core/bootstrap.php
index 4d604dadcc..0a4910b052 100644
--- a/phpBB/includes/core/bootstrap.php
+++ b/phpBB/includes/core/bootstrap.php
@@ -61,44 +61,14 @@ if (defined('IN_CRON'))
 // Set some default configuration parameter if the config file does not exist
 if (!file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
 {
-	define('CONFIG_ADM_FOLDER', 'adm');
-	define('CONFIG_ACM_TYPE', 'file');
-
+	// phpbb::$base_config['config_set'] = false
 	// This allows common.php or an installation script to do specific actions if the configuration is missing
-	define('PHPBB_CONFIG_MISSING', true);
 }
 else
 {
 	require PHPBB_ROOT_PATH . 'config.' . PHP_EXT;
 }
 
-// Set default configuration variables if phpBB is not installed
-if (!defined('PHPBB_INSTALLED'))
-{
-	$dbms = $dbhost = $dbport = $dbname = $dbuser = $dbpasswd = '';
-	$table_prefix = 'phpbb_';
-}
-
-if (defined('DEBUG_EXTRA'))
-{
-	$base_memory_usage = 0;
-	if (function_exists('memory_get_usage'))
-	{
-		$base_memory_usage = memory_get_usage();
-	}
-}
-
-// Load Extensions
-if (!empty($load_extensions))
-{
-	$load_extensions = explode(',', $load_extensions);
-
-	foreach ($load_extensions as $extension)
-	{
-		@dl(trim($extension));
-	}
-}
-
 // Register autoload function
 spl_autoload_register('__phpbb_autoload');