aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-02-04 11:20:59 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-12-03 14:20:28 +0100
commitade5183ba1f10e3ba1aea927204e25f3b218ceb2 (patch)
treefb09ffacc65fd52f87205e4631c193da243d8378
parent90a5e22eb51fa20c94d576ffc5cdb49fb31dab3a (diff)
downloadforums-ade5183ba1f10e3ba1aea927204e25f3b218ceb2.tar
forums-ade5183ba1f10e3ba1aea927204e25f3b218ceb2.tar.gz
forums-ade5183ba1f10e3ba1aea927204e25f3b218ceb2.tar.bz2
forums-ade5183ba1f10e3ba1aea927204e25f3b218ceb2.tar.xz
forums-ade5183ba1f10e3ba1aea927204e25f3b218ceb2.zip
[ticket/14492] Pass u_action to acp form and add stats config
PHPBB3-14492
-rw-r--r--phpBB/includes/acp/acp_help_phpbb.php1
-rw-r--r--phpBB/install/schemas/schema_data.sql1
2 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_help_phpbb.php b/phpBB/includes/acp/acp_help_phpbb.php
index 9dd641dfd5..bcbe61adb8 100644
--- a/phpBB/includes/acp/acp_help_phpbb.php
+++ b/phpBB/includes/acp/acp_help_phpbb.php
@@ -116,6 +116,7 @@ class acp_help_phpbb
'S_COLLECT_STATS' => (!empty($config['help_send_statistics'])) ? true : false,
'RAW_DATA' => $collector->get_data_for_form(),
'U_ACP_MAIN' => append_sid("{$phpbb_admin_path}index.$phpEx"),
+ 'U_ACTION' => $this->u_action,
));
$raw = $collector->get_data_raw();
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 0cff26977e..450d2d2a52 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -142,6 +142,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_postgres_
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_sphinx_indexer_mem_limit', '512');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('fulltext_sphinx_stopwords', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('gzip_compress', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('help_send_statistics', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '25');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0');