diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-11 14:15:46 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-11 14:15:46 +0200 |
| commit | cab660f9097e7753bf9bc80c1cd1a0004adc421c (patch) | |
| tree | eab8767acec379d7d69ab9623ecc8f7c4e6a8d30 /phpBB/includes/acp/acp_board.php | |
| parent | a30f1729d8cb36d9d52167c08a139c99c63c4fdf (diff) | |
| parent | 2198c29c205ba3a98e66746b9527c50c50f7c1e2 (diff) | |
| download | forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.gz forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.bz2 forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.tar.xz forums-cab660f9097e7753bf9bc80c1cd1a0004adc421c.zip | |
Merge remote-tracking branch 'phpbb/develop' into ticket/11621
* phpbb/develop:
[ticket/11867] Schema files are not created by create_schema_files.php
[ticket/11905] 3.1.0-a1 Migration
[ticket/11903] Speed up paging test
[ticket/11703] Extend the correct migration class.
[ticket/11874] Correct when $phpbb_root_path is appended to build_url()
[ticket/11703] Also use empty() for T_JQUERY_LINK.
[ticket/11703] Add effectively_installed().
[ticket/11703] Make jQuery CDN switch more generic.
[ticket/11874] Fix tests
[ticket/11874] Do not always prepend the web path; only replace phpbb_root_path
[ticket/11345] Don't include scheme, so HTTPS is used where necessary.
[ticket/11345] Wrap remote webfonts in S_ALLOW_CDN.
[ticket/11345] Move css import to template
[ticket/11345] Add Droid Sans as fallback font
[ticket/11345] Change font for buttons
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 8f2548166b..40dca53b76 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -344,7 +344,7 @@ class acp_board 'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'load_user_activity' => array('lang' => 'LOAD_USER_ACTIVITY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'load_jquery_cdn' => array('lang' => 'LOAD_JQUERY_CDN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'allow_cdn' => array('lang' => 'ALLOW_CDN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'legend3' => 'CUSTOM_PROFILE_FIELDS', 'load_cpf_memberlist' => array('lang' => 'LOAD_CPF_MEMBERLIST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), |