From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 23 Feb 2012 22:12:53 +0000 (+0100)
Subject: Fixed packageDir detection for applications
X-Git-Tag: 2.0.0_Beta_1~1313
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9bdcaaafc9e4de8e6a5ec827a97c97b330c630db;p=GitHub%2FWoltLab%2FWCF.git

Fixed packageDir detection for applications
---

diff --git a/wcfsetup/install/files/lib/system/form/FormDocument.class.php b/wcfsetup/install/files/lib/system/form/FormDocument.class.php
index 7976f3d2f1..3736c8c7a4 100644
--- a/wcfsetup/install/files/lib/system/form/FormDocument.class.php
+++ b/wcfsetup/install/files/lib/system/form/FormDocument.class.php
@@ -130,8 +130,8 @@ class FormDocument {
 	 * @param unknown_type $error
 	 */
 	public function setError($name, $error) {
-		foreach ($this->container as $container) {
-			$this->containers->setError($name, $error);
+		foreach ($this->containers as $container) {
+			$container->setError($name, $error);
 		}
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 9183ee8348..c7253a7e71 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -457,9 +457,9 @@ class PackageInstallationDispatcher {
 			
 			if ($packageDir !== null) {
 				// validate package dir
-				if (file_exists(FileUtil::addLeadingSlash($packageDir) . 'global.php')) {
+				if (file_exists(FileUtil::addTrailingSlash($packageDir) . 'global.php')) {
 					$document->setError('packageDir', WCF::getLanguage()->get('wcf.acp.package.packageDir.notAvailable'));
-					return null;
+					return $document;
 				}
 				
 				// set package dir