From 099beb8153227dfd84f59a174675996b3e3b8764 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 3 Sep 2014 20:40:52 +0200
Subject: [PATCH] [ticket/320] Remove setting for displaying phpBB menu from
 acp

B3P-320
---
 acp/portal_module.php      |  1 -
 language/de/portal_acp.php |  2 --
 language/en/portal_acp.php |  2 --
 migrations/v210_rc1.php    | 26 ++++++++++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 migrations/v210_rc1.php

diff --git a/acp/portal_module.php b/acp/portal_module.php
index 2846b452..a42c7a60 100644
--- a/acp/portal_module.php
+++ b/acp/portal_module.php
@@ -81,7 +81,6 @@ class portal_module
 						'board3_left_column'		=> array('lang' => 'PORTAL_LEFT_COLUMN',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_right_column'		=> array('lang' => 'PORTAL_RIGHT_COLUMN',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_version_check'		=> array('lang' => 'PORTAL_VERSION_CHECK',		'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => false),
-						'board3_phpbb_menu'			=> array('lang' => 'PORTAL_PHPBB_MENU',			'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 						'board3_display_jumpbox'	=> array('lang' => 'PORTAL_DISPLAY_JUMPBOX',	'validate' => 'bool',	'type' => 'radio:yes_no',	'explain' => true),
 
 						'legend2'					=> 'ACP_PORTAL_COLUMN_WIDTH_SETTINGS',
diff --git a/language/de/portal_acp.php b/language/de/portal_acp.php
index 5a7acd99..02ff40dc 100644
--- a/language/de/portal_acp.php
+++ b/language/de/portal_acp.php
@@ -91,8 +91,6 @@ $lang = array_merge($lang, array(
 	'PORTAL_LEFT_COLUMN_WIDTH_EXP'			=> 'Ändere hier die Breite der linken Spalte in Pixel, empfohlener Wert 180',
 	'PORTAL_RIGHT_COLUMN_WIDTH'				=> 'Breite der rechten Spalte',
 	'PORTAL_RIGHT_COLUMN_WIDTH_EXP'			=> 'Ändere hier die Breite der rechten Spalte in Pixel, empfohlener Wert 180',
-	'PORTAL_PHPBB_MENU'						=> 'phpBB-Menü',
-	'PORTAL_PHPBB_MENU_EXP'					=> 'Den phpBB Header auf dem Portal anzeigen.',
 	'PORTAL_DISPLAY_JUMPBOX'				=> 'Zeige Jumpbox',
 	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Die Jumpbox auf dem Portal anzeigen. Die Jumpbox wird nur angezeigt, wenn sie gleichzeitig in den Board-Funktionalitäten aktiviert ist.',
 
diff --git a/language/en/portal_acp.php b/language/en/portal_acp.php
index 1180797e..97d28a71 100644
--- a/language/en/portal_acp.php
+++ b/language/en/portal_acp.php
@@ -85,8 +85,6 @@ $lang = array_merge($lang, array(
 	'PORTAL_RIGHT_COLUMN'					=> 'Enable right column',
 	'PORTAL_RIGHT_COLUMN_EXP'				=> 'Switch to no if you wish to turn off the right column',
 	'PORTAL_VERSION_CHECK'					=> 'Versioncheck on Portal',
-	'PORTAL_PHPBB_MENU'						=> 'phpBB menu',
-	'PORTAL_PHPBB_MENU_EXP'					=> 'Display the phpBB Header on the portal.',
 	'PORTAL_DISPLAY_JUMPBOX'				=> 'Display jumpbox',
 	'PORTAL_DISPLAY_JUMPBOX_EXP'			=> 'Display the jumpbox on the portal. The jumpbox will only be displayed if it is also enabled in the board features.',
 	'ACP_PORTAL_COLUMN_WIDTH_SETTINGS'		=> 'Left and right column width settings',
diff --git a/migrations/v210_rc1.php b/migrations/v210_rc1.php
new file mode 100644
index 00000000..52c41f82
--- /dev/null
+++ b/migrations/v210_rc1.php
@@ -0,0 +1,26 @@
+<?php
+/**
+*
+* @package Board3 Portal v2.1
+* @copyright (c) 2014 Board3 Group ( www.board3.de )
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace board3\portal\migrations;
+
+class v210_rc1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\board3\portal\migrations\v210_beta1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.remove', array('board3_phpbb_menu')),
+			array('config.update', array('board3_portal_version', '2.1.0-rc1')),
+		);
+	}
+}