From: Marcel Werk <burntime@woltlab.com>
Date: Wed, 11 Feb 2015 12:57:11 +0000 (+0100)
Subject: Fixed wrong package dir in style export
X-Git-Tag: 2.1.0_RC_1~6^2~4
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ddd769d74f190601e5ff1e7dd9a07e08e0deae6;p=GitHub%2FWoltLab%2FWCF.git

Fixed wrong package dir in style export
---

diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index 3ac6e08bc1..e4b0f9183f 100644
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@ -665,15 +665,17 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
 			$statement->execute(array($this->templateGroupID));
 			while ($row = $statement->fetchArray()) {
 				$packageDir = 'com.woltlab.wcf';
+				$package = null;
 				
 				if ($row['application'] != 'wcf') {
 					$application = ApplicationHandler::getInstance()->getApplication($row['application']);
-					$packageDir = $row['package'];
+					$package = PackageCache::getInstance()->getPackage($application->packageID);
+					$packageDir = $package->package;
 				}
 				else {
 					$application = ApplicationHandler::getInstance()->getWCF();
+					$package = PackageCache::getInstance()->getPackage($application->packageID);
 				}
-				$package = PackageCache::getInstance()->getPackage($application->packageID);
 				
 				$filename = FileUtil::addTrailingSlash(FileUtil::getRealPath(WCF_DIR . $package->packageDir . 'templates/' . $templateGroup->templateGroupFolderName)) . $row['templateName'] . '.tpl';
 				$templatesTar->add($filename, $packageDir, dirname($filename));