From a8f5695666229512ccd5d122daa0a7ad7004015b Mon Sep 17 00:00:00 2001
From: Tabitha Backoff <t_backoff@yahoo.com>
Date: Thu, 28 Mar 2013 17:53:14 -0400
Subject: Migration file and change board_home_text to board_index_text

---
 phpBB/includes/acp/acp_board.php                   |  2 +-
 .../includes/db/migration/data/310/boardindex.php  | 23 ++++++++++++++++++++++
 phpBB/includes/db/migration/data/310/dev.php       |  2 --
 phpBB/includes/functions.php                       |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 phpBB/includes/db/migration/data/310/boardindex.php

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index e609eab01e..bacf0d6e57 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -55,7 +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_home_text'		=> array('lang' => 'BOARD_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..5a1ff62a47
--- /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 version_compare($this->config['version'], '3.1.0-dev', '>=');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.add', array('board_index_text', '')),
+		);
+	}
+}
diff --git a/phpBB/includes/db/migration/data/310/dev.php b/phpBB/includes/db/migration/data/310/dev.php
index 950d84c09e..13b36bbf30 100644
--- a/phpBB/includes/db/migration/data/310/dev.php
+++ b/phpBB/includes/db/migration/data/310/dev.php
@@ -108,8 +108,6 @@ class phpbb_db_migration_data_310_dev extends phpbb_db_migration
 			array('config.add', array('site_home_url', '')),
 			array('config.add', array('site_home_text', '')),
 
-			array('config.add', array('board_home_text', '')),
-
 			array('permission.add', array('u_chgprofileinfo', true, 'u_sig')),
 
 			array('module.add', array(
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 0dca9bb2dc..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'			=> ($config['board_home_text'] !== '') ? $config['board_home_text'] : $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,
 
-- 
cgit v1.2.1