diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-15 12:00:21 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-09-15 12:00:21 -0500 |
| commit | fc6457140cd775cb0f89c803324844d602200c14 (patch) | |
| tree | bba1d70c4c1e29db3723446d0f9171c45aa051d2 /phpBB/includes/acp | |
| parent | 9c54465a1331216be1e3369346921dee9148e590 (diff) | |
| parent | 9a92c45ad365629fac658ba566d16097a6eac644 (diff) | |
| download | forums-fc6457140cd775cb0f89c803324844d602200c14.tar forums-fc6457140cd775cb0f89c803324844d602200c14.tar.gz forums-fc6457140cd775cb0f89c803324844d602200c14.tar.bz2 forums-fc6457140cd775cb0f89c803324844d602200c14.tar.xz forums-fc6457140cd775cb0f89c803324844d602200c14.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
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), |