diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-03-31 15:57:26 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-03-31 15:57:26 -0700 |
| commit | a7cf2bdace6dbe97e807e55a063ef6fb8ed20921 (patch) | |
| tree | ac9deb9b896d927fcd4077e23c05b121d5d43d64 /phpBB/includes | |
| parent | 78dc1c84c85704d4834ca6bffed8b9d7f397f152 (diff) | |
| parent | 5d669ed1c52250d6f0a378f6aa4ee6538daf86e3 (diff) | |
| download | forums-a7cf2bdace6dbe97e807e55a063ef6fb8ed20921.tar forums-a7cf2bdace6dbe97e807e55a063ef6fb8ed20921.tar.gz forums-a7cf2bdace6dbe97e807e55a063ef6fb8ed20921.tar.bz2 forums-a7cf2bdace6dbe97e807e55a063ef6fb8ed20921.tar.xz forums-a7cf2bdace6dbe97e807e55a063ef6fb8ed20921.zip | |
Merge pull request #1323 from t-backoff/ticket/11477
Ticket/11477
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/db/migration/data/310/boardindex.php | 23 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
3 files changed, 25 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 6543427677..bacf0d6e57 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -55,6 +55,7 @@ class acp_board '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_index_text' => array('lang' => 'BOARD_INDEX_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), diff --git a/phpBB/includes/db/migration/data/310/boardindex.php b/phpBB/includes/db/migration/data/310/boardindex.php new file mode 100644 index 0000000000..965e32c15c --- /dev/null +++ b/phpBB/includes/db/migration/data/310/boardindex.php @@ -0,0 +1,23 @@ +<?php +/** +* +* @package migration +* @copyright (c) 2013 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2 +* +*/ + +class phpbb_db_migration_data_310_boardindex extends phpbb_db_migration +{ + public function effectively_installed() + { + return isset($this->config['board_index_text']); + } + + public function update_data() + { + return array( + array('config.add', array('board_index_text', '')), + ); + } +} diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 98a2c0db79..58d2ad4760 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5292,7 +5292,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'BOARD_URL' => $board_url, 'L_LOGIN_LOGOUT' => $l_login_logout, - 'L_INDEX' => $user->lang['FORUM_INDEX'], + 'L_INDEX' => ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'], 'L_SITE_HOME' => ($config['site_home_text'] !== '') ? $config['site_home_text'] : $user->lang['HOME'], 'L_ONLINE_EXPLAIN' => $l_online_time, |