From 20bd85a43366dfe7f5dfe386e4af4ff371c75094 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 30 Dec 2012 20:07:53 +0100
Subject: [PATCH] Uses AbstractPage::$activeMenuItem and removes use of ACPForm

---
 files/lib/acp/form/LanguageAddForm.class.php             | 5 +++--
 files/lib/acp/form/LanguageExportForm.class.php          | 6 ++++--
 files/lib/acp/form/LanguageMultilingualismForm.class.php | 5 +++--
 files/lib/acp/form/LanguageServerAddForm.class.php       | 5 +++--
 files/lib/acp/form/LanguageServerEditForm.class.php      | 3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/files/lib/acp/form/LanguageAddForm.class.php b/files/lib/acp/form/LanguageAddForm.class.php
index f1ba645e9f..09da6feffd 100644
--- a/files/lib/acp/form/LanguageAddForm.class.php
+++ b/files/lib/acp/form/LanguageAddForm.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\form;
 use wcf\data\language\LanguageEditor;
+use wcf\form\AbstractForm;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
@@ -19,9 +20,9 @@ use wcf\util\XML;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class LanguageAddForm extends ACPForm {
+class LanguageAddForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.language.add';
 	
diff --git a/files/lib/acp/form/LanguageExportForm.class.php b/files/lib/acp/form/LanguageExportForm.class.php
index 9b67d01f1d..d5f8bc6745 100644
--- a/files/lib/acp/form/LanguageExportForm.class.php
+++ b/files/lib/acp/form/LanguageExportForm.class.php
@@ -2,6 +2,7 @@
 namespace wcf\acp\form;
 use wcf\data\language\LanguageEditor;
 use wcf\data\package\Package;
+use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
@@ -18,14 +19,15 @@ use wcf\util\StringUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class LanguageExportForm extends ACPForm {
+class LanguageExportForm extends AbstractForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$templateName
+	 * @todo still needed?
 	 */
 	public $templateName = 'languageExport';
 	
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.language';
 	
diff --git a/files/lib/acp/form/LanguageMultilingualismForm.class.php b/files/lib/acp/form/LanguageMultilingualismForm.class.php
index f8a3a1ef15..dc14dff7f8 100644
--- a/files/lib/acp/form/LanguageMultilingualismForm.class.php
+++ b/files/lib/acp/form/LanguageMultilingualismForm.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\form;
 use wcf\data\language\LanguageEditor;
+use wcf\form\AbstractForm;
 use wcf\system\language\LanguageFactory;
 use wcf\system\exception\UserInputException;
 use wcf\system\cache\CacheHandler;
@@ -18,9 +19,9 @@ use wcf\util\ArrayUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class LanguageMultilingualismForm extends ACPForm {
+class LanguageMultilingualismForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.language.multilingualism';
 	
diff --git a/files/lib/acp/form/LanguageServerAddForm.class.php b/files/lib/acp/form/LanguageServerAddForm.class.php
index 8c6edf0230..cdc6dc70df 100644
--- a/files/lib/acp/form/LanguageServerAddForm.class.php
+++ b/files/lib/acp/form/LanguageServerAddForm.class.php
@@ -2,6 +2,7 @@
 namespace wcf\acp\form;
 use wcf\data\language\server\LanguageServerAction;
 use wcf\data\package\update\server\PackageUpdateServer;
+use wcf\form\AbstractForm;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
 use wcf\system\exception\UserInputException;
@@ -17,9 +18,9 @@ use wcf\util\StringUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class LanguageServerAddForm extends ACPForm {
+class LanguageServerAddForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.language.server.add';
 	
diff --git a/files/lib/acp/form/LanguageServerEditForm.class.php b/files/lib/acp/form/LanguageServerEditForm.class.php
index 7411e77315..6ada4c81e7 100644
--- a/files/lib/acp/form/LanguageServerEditForm.class.php
+++ b/files/lib/acp/form/LanguageServerEditForm.class.php
@@ -19,11 +19,12 @@ use wcf\system\exception\IllegalLinkException;
 class LanguageServerEditForm extends LanguageServerAddForm {
 	/**
 	 * @see	wcf\page\AbstractPage::$templateName
+	 * @todo still needed?
 	 */
 	public $templateName = 'languageServerAdd';
 	
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.language.server';
 	
-- 
2.20.1