From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 30 Dec 2012 19:08:27 +0000 (+0100)
Subject: Uses AbstractPage::$activeMenuItem and removes use of ACPForm
X-Git-Tag: 2.0.0_Beta_1~617^2^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f99d09602c1b3e4960af7f995d5145b63661f559;p=GitHub%2FWoltLab%2FWCF.git

Uses AbstractPage::$activeMenuItem and removes use of ACPForm
---

diff --git a/files/lib/acp/form/StyleAddForm.class.php b/files/lib/acp/form/StyleAddForm.class.php
index b11f9f7f62..ac00328227 100644
--- a/files/lib/acp/form/StyleAddForm.class.php
+++ b/files/lib/acp/form/StyleAddForm.class.php
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\data\package\Package;
 use wcf\data\style\StyleAction;
 use wcf\data\template\group\TemplateGroupList;
+use wcf\form\AbstractForm;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
@@ -22,9 +23,9 @@ use wcf\util\StringUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class StyleAddForm extends ACPForm {
+class StyleAddForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.style.add';
 	
diff --git a/files/lib/acp/form/StyleEditForm.class.php b/files/lib/acp/form/StyleEditForm.class.php
index b896a2499d..e3cd72ad8b 100644
--- a/files/lib/acp/form/StyleEditForm.class.php
+++ b/files/lib/acp/form/StyleEditForm.class.php
@@ -18,7 +18,7 @@ use wcf\system\WCF;
  */
 class StyleEditForm extends StyleAddForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.style';
 	
diff --git a/files/lib/acp/form/StyleExportForm.class.php b/files/lib/acp/form/StyleExportForm.class.php
index b036884556..8dbee48091 100644
--- a/files/lib/acp/form/StyleExportForm.class.php
+++ b/files/lib/acp/form/StyleExportForm.class.php
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\data\package\Package;
 use wcf\data\style\Style;
 use wcf\data\style\StyleEditor;
+use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
@@ -18,9 +19,9 @@ use wcf\util\StringUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class StyleExportForm extends ACPForm {
+class StyleExportForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.style';
 	
diff --git a/files/lib/acp/form/StyleImportForm.class.php b/files/lib/acp/form/StyleImportForm.class.php
index c8b305c9f8..2c9ce89552 100644
--- a/files/lib/acp/form/StyleImportForm.class.php
+++ b/files/lib/acp/form/StyleImportForm.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\form;
 use wcf\data\style\StyleEditor;
+use wcf\form\AbstractForm;
 use wcf\system\exception\UserInputException;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
@@ -15,9 +16,9 @@ use wcf\util\FileUtil;
  * @subpackage	acp.form
  * @category	Community Framework
  */
-class StyleImportForm extends ACPForm {
+class StyleImportForm extends AbstractForm {
 	/**
-	 * @see	wcf\acp\form\ACPForm::$activeMenuItem
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
 	 */
 	public $activeMenuItem = 'wcf.acp.menu.link.style.import';
 	
diff --git a/files/lib/acp/page/StyleListPage.class.php b/files/lib/acp/page/StyleListPage.class.php
index 938fb76501..e83d9f0f6e 100644
--- a/files/lib/acp/page/StyleListPage.class.php
+++ b/files/lib/acp/page/StyleListPage.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace wcf\acp\page;
 use wcf\page\MultipleLinkPage;
-use wcf\system\menu\acp\ACPMenu;
 
 /**
  * Shows the style list page.
@@ -14,6 +13,11 @@ use wcf\system\menu\acp\ACPMenu;
  * @category	Community Framework
  */
 class StyleListPage extends MultipleLinkPage {
+	/**
+	 * @see	wcf\page\AbstractPage::$activeMenuItem
+	 */
+	public $activeMenuItem = 'wcf.acp.menu.link.style.list';
+	
 	/**
 	 * @see	wcf\page\AbstractPage::$neededPermissions
 	 */
@@ -42,14 +46,4 @@ class StyleListPage extends MultipleLinkPage {
 		
 		$this->objectList->sqlSelects = "(SELECT COUNT(*) FROM wcf".WCF_N."_user WHERE styleID = style.styleID) AS users";
 	}
-	
-	/**
-	 * @see	wcf\page\IPage::show()
-	 */
-	public function show() {
-		// set active menu item.
-		ACPMenu::getInstance()->setActiveMenuItem('wcf.acp.menu.link.style.list');
-	
-		parent::show();
-	}
 }