From 8f3fc89726110da7cff9fd2b6b77c94b4e19f12b Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 5 Jan 2013 18:08:23 +0100
Subject: [PATCH] Fixes coding style

---
 wcfsetup/install/files/lib/system/WCF.class.php                | 3 ++-
 wcfsetup/install/files/lib/system/cache/CacheHandler.class.php | 3 ++-
 .../lib/system/package/PackageInstallationDispatcher.class.php | 3 ++-
 .../install/files/lib/system/session/SessionHandler.class.php  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 3eb5731529..36c24bbc49 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system;
 use wcf\data\application\Application;
+use wcf\data\option\OptionEditor;
 use wcf\data\package\PackageCache;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\CacheHandler;
@@ -330,7 +331,7 @@ class WCF {
 		
 		// create options file if doesn't exist
 		if (!file_exists($filename) || filemtime($filename) <= 1) {
-			\wcf\data\option\OptionEditor::rebuild();
+			OptionEditor::rebuild();
 		}
 		require_once($filename);
 	}
diff --git a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
index 0d9628b978..1cd4633859 100644
--- a/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
+++ b/wcfsetup/install/files/lib/system/cache/CacheHandler.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\cache;
+use wcf\system\cache\source\DiskCacheSource;
 use wcf\system\exception\SystemException;
 use wcf\system\SingletonFactory;
 
@@ -38,7 +39,7 @@ class CacheHandler extends SingletonFactory {
 		catch (SystemException $e) {
 			if (CACHE_SOURCE_TYPE != 'disk') {
 				// fallback to disk cache
-				$this->cacheSource = new \wcf\system\cache\source\DiskCacheSource();
+				$this->cacheSource = new DiskCacheSource();
 			}
 			else {
 				throw $e;
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index a66dc2729f..f297fc5f17 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -26,6 +26,7 @@ use wcf\system\package\plugin\ObjectTypePackageInstallationPlugin;
 use wcf\system\package\plugin\SQLPackageInstallationPlugin;
 use wcf\system\request\LinkHandler;
 use wcf\system\request\RouteHandler;
+use wcf\system\setup\Installer;
 use wcf\system\style\StyleHandler;
 use wcf\system\version\VersionHandler;
 use wcf\system\WCF;
@@ -539,7 +540,7 @@ class PackageInstallationDispatcher {
 	 * @return	wcf\system\setup\Installer
 	 */
 	public function extractFiles($targetDir, $sourceArchive, $fileHandler = null) {
-		return new \wcf\system\setup\Installer($targetDir, $sourceArchive, $fileHandler);
+		return new Installer($targetDir, $sourceArchive, $fileHandler);
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index b578a6b0ed..e53ea02af3 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\session;
 use wcf\data\user\User;
+use wcf\page\ITrackablePage;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\request\RequestHandler;
@@ -518,7 +519,7 @@ class SessionHandler extends SingletonFactory {
 			'requestMethod' => $this->requestMethod,
 			'lastActivityTime' => TIME_NOW
 		);
-		if (PACKAGE_ID && RequestHandler::getInstance()->getActiveRequest() && RequestHandler::getInstance()->getActiveRequest()->getRequestObject() instanceof \wcf\page\ITrackablePage && RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->isTracked()) {
+		if (PACKAGE_ID && RequestHandler::getInstance()->getActiveRequest() && RequestHandler::getInstance()->getActiveRequest()->getRequestObject() instanceof ITrackablePage && RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->isTracked()) {
 			$data['controller'] = RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->getController();
 			$data['parentObjectType'] = RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->getParentObjectType();
 			$data['parentObjectID'] = RequestHandler::getInstance()->getActiveRequest()->getRequestObject()->getParentObjectID();
-- 
2.20.1