From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 24 Aug 2011 15:34:46 +0000 (+0200)
Subject: Updates page locations
X-Git-Tag: 2.0.0_Beta_1~1807^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2291b91928f2519c7054a8a7046504a4f83e954e;p=GitHub%2FWoltLab%2FWCF.git

Updates page locations

Changes: - ILocation is now IPageLocation - ILocation isn't in the data
folder anymore but in the system folder - IPageLocation uses
PageLocation database objects rather than arrays
---

diff --git a/wcfsetup/install/files/lib/data/page/location/ILocation.class.php b/wcfsetup/install/files/lib/data/page/location/ILocation.class.php
deleted file mode 100644
index a757621c66..0000000000
--- a/wcfsetup/install/files/lib/data/page/location/ILocation.class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace wcf\data\page\location;
-use wcf\data\IDatabaseObjectProcessor;
-
-/**
- * Any page location class should implement this interface.
- *
- * @author 	Marcel Werk
- * @copyright	2001-2011 WoltLab GmbH
- * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf
- * @subpackage	data.page.location
- * @category 	Community Framework
- */
-interface ILocation extends IDatabaseObjectProcessor {
-	/**
-	 * Caches the information of a page location.
-	 * 
-	 * @param	array		$location
-	 * @param	string		$requestURI
-	 * @param	string		$requestMethod
-	 * @param	array		$match
-	 */
-	public function cache($location, $requestURI, $requestMethod, $match);
-	
-	/**
-	 * Returns the information of a page location.
-	 * 
-	 * @param	array		$location
-	 * @param	string		$requestURI
-	 * @param	string		$requestMethod
-	 * @param	array		$match
-	 * @return	string
-	 */
-	public function get($location, $requestURI, $requestMethod, $match);
-}
diff --git a/wcfsetup/install/files/lib/data/page/location/PageLocation.class.php b/wcfsetup/install/files/lib/data/page/location/PageLocation.class.php
index 3c6053d144..c85efc46e2 100644
--- a/wcfsetup/install/files/lib/data/page/location/PageLocation.class.php
+++ b/wcfsetup/install/files/lib/data/page/location/PageLocation.class.php
@@ -26,5 +26,5 @@ class PageLocation extends ProcessibleDatabaseObject {
 	/**
 	 * @see	wcf\data\ProcessibleDatabaseObject::$processorInterface
 	 */
-	protected static $processorInterface = 'wcf\data\page\location\ILocation';
+	protected static $processorInterface = 'wcf\system\page\location\IPageLocation';
 }
diff --git a/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php b/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php
new file mode 100644
index 0000000000..7d7b2560fe
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/page/location/IPageLocation.class.php
@@ -0,0 +1,37 @@
+<?php
+namespace wcf\system\page\location;
+use wcf\data\page\location\PageLocation;
+use wcf\data\IDatabaseObjectProcessor;
+
+/**
+ * Any page location class should implement this interface.
+ *
+ * @author 	Marcel Werk
+ * @copyright	2001-2011 WoltLab GmbH
+ * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @package	com.woltlab.wcf
+ * @subpackage	system.page.location
+ * @category 	Community Framework
+ */
+interface IPageLocation extends IDatabaseObjectProcessor {
+	/**
+	 * Caches the information of a page location.
+	 * 
+	 * @param	wcf\data\page\location\PageLocation	$location
+	 * @param	string		$requestURI
+	 * @param	string		$requestMethod
+	 * @param	array		$match
+	 */
+	public function cache(PageLocation $location, $requestURI, $requestMethod, array $match);
+	
+	/**
+	 * Returns the information of a page location.
+	 * 
+	 * @param	wcf\data\page\location\PageLocation	$location
+	 * @param	string		$requestURI
+	 * @param	string		$requestMethod
+	 * @param	array		$match
+	 * @return	string
+	 */
+	public function get(PageLocation $location, $requestURI, $requestMethod, array $match);
+}