aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2005-12-17 21:16:21 +0000
committerDavid M <davidmj@users.sourceforge.net>2005-12-17 21:16:21 +0000
commitab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8 (patch)
tree5902fa996462e1eeb23a1e48bfb0727ef276370c
parente7565d31d0c25a330f5310bed765d9470096c21d (diff)
downloadforums-ab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8.tar
forums-ab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8.tar.gz
forums-ab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8.tar.bz2
forums-ab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8.tar.xz
forums-ab99455e7ce6ac98cf1f721a0c49e2e1eeb8d4b8.zip
- send_encoding is now configurable
git-svn-id: file:///svn/phpbb/trunk@5346 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_board.php1
-rw-r--r--phpBB/install/schemas/schema_data.sql1
-rw-r--r--phpBB/language/en/acp/board.php2
3 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ac0d71daf6..0318326921 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -184,6 +184,7 @@ class acp_board
'max_autologin_time' => array('lang' => 'AUTOLOGIN_LENGTH', 'type' => 'text:5:5', 'explain' => true),
'ip_check' => array('lang' => 'IP_VALID', 'type' => 'custom', 'method' => 'select_ip_check', 'explain' => true),
'browser_check' => array('lang' => 'BROWSER_VALID', 'type' => 'radio:yes_no', 'explain' => true),
+ 'send_encoding' => array('lang' => 'SEND_ENCODING', 'type' => 'radio:yes_no', 'explain' => true),
'gzip_compress' => array('lang' => 'ENABLE_GZIP', 'type' => 'radio:yes_no', 'explain' => false),
'legend2' => 'PATH_SETTINGS',
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index f8af45e077..7e29a03ca4 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -162,6 +162,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'ful
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_downloads', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('send_encoding', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_name', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('server_port', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('session_gc', '3600');
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 6d15061a86..469137c0b0 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -132,6 +132,8 @@ $lang = array_merge($lang, array(
'CLASS_B' => 'A.B',
'BROWSER_VALID' => 'Validate browser',
'BROWSER_VALID_EXPLAIN' => 'Enables browser validation for each session inproving security.',
+ 'SEND_ENCODING' => 'Send Encoding',
+ 'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver configuration',
'ENABLE_GZIP' => 'Enable GZip Compression',
'SMILIES_PATH' => 'Smilies storage path',
'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root dir, e.g. images/smilies',