diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-09-15 17:48:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-09-15 17:48:51 +0200 |
| commit | 5dc7aba18ffa1e47d835c80bdb6f921293fc0c18 (patch) | |
| tree | 6c2814183f45f4cefe9e347e53b5d23ab5288552 /phpBB/includes/acp | |
| parent | f1fb555ea32fdd06dfdcae35c072e44b6c243126 (diff) | |
| parent | 480e3daede1cba1e0c62878be3bd12810e4ccf37 (diff) | |
| download | forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.gz forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.bz2 forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.tar.xz forums-5dc7aba18ffa1e47d835c80bdb6f921293fc0c18.zip | |
Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
[ticket/11021] Remove unnecessary line spacing in functions.php
[ticket/11021] Use L_SITE_HOME instead of L_HOME
[ticket/11021] Better language strings for site home url/text
[ticket/11021] subsilver2 support
[ticket/11021] Add the option to specify a Site home URL and text
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 575d05933f..322e1c55d8 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -53,6 +53,8 @@ class acp_board 'legend1' => 'ACP_BOARD_SETTINGS', 'sitename' => array('lang' => 'SITE_NAME', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => false), 'site_desc' => array('lang' => 'SITE_DESC', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => false), + 'site_home_url' => array('lang' => 'SITE_HOME_URL', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), + 'site_home_text' => array('lang' => 'SITE_HOME_TEXT', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), 'board_disable' => array('lang' => 'DISABLE_BOARD', 'validate' => 'bool', 'type' => 'custom', 'method' => 'board_disable', 'explain' => true), 'board_disable_msg' => false, 'default_lang' => array('lang' => 'DEFAULT_LANGUAGE', 'validate' => 'lang', 'type' => 'select', 'function' => 'language_select', 'params' => array('{CONFIG_VALUE}'), 'explain' => false), |