2 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/install/install.php b/phpBB/install/install.php
index ab8ad4341c..883e8133c5 100644
--- a/phpBB/install/install.php
+++ b/phpBB/install/install.php
@@ -1054,13 +1054,13 @@ if ($stage == 3)
 		$dbms_schema = 'schemas/' . $available_dbms[$dbms]['SCHEMA'] . '_schema.sql';
 
 		// How should we treat this schema?
-		$remove_remarks = $available_dbms[$dbms]['COMMENTS'];;
+		$remove_remarks = $available_dbms[$dbms]['COMMENTS'];
 		$delimiter = $available_dbms[$dbms]['DELIM'];
 
 		$sql_query = @fread(@fopen($dbms_schema, 'r'), @filesize($dbms_schema));
 		$sql_query = preg_replace('#phpbb_#is', $table_prefix, $sql_query);
 
-		$sql_query = $remove_remarks($sql_query);
+		$remove_remarks($sql_query);
 		$sql_query = split_sql_file($sql_query, $delimiter);
 
 		foreach ($sql_query as $sql)
@@ -1092,7 +1092,7 @@ if ($stage == 3)
 
 		$sql_query = preg_replace('#phpbb_#', $table_prefix, $sql_query);
 
-		$sql_query = remove_remarks($sql_query);
+		remove_remarks($sql_query);
 		$sql_query = split_sql_file($sql_query, ';');
 
 		foreach ($sql_query as $sql)
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 81cc718abb..8b22f250e0 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -74,6 +74,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_onlinetrack', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_tplcompile', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewprofile', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_memberlist', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('cache_gc', '7200');