From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 8 Dec 2012 02:14:12 +0000 (+0100)
Subject: Attempt to fix WCFSetup
X-Git-Tag: 2.0.0_Beta_1~726^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ea8203405f7394145f196de5fce2bd681c84b530;p=GitHub%2FWoltLab%2FWCF.git

Attempt to fix WCFSetup

See #965
---

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 95b0698c6e..a9a0f7c081 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -37,8 +37,8 @@ class WCFACP extends WCF {
 		// start initialization
 		$this->initMagicQuotes();
 		$this->initDB();
-		$this->initPackage();
 		$this->loadOptions();
+		$this->initPackage();
 		$this->initCache();
 		$this->initSession();
 		$this->initLanguage();
diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
index df84c98de4..d1dda3fc17 100644
--- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
@@ -495,7 +495,7 @@ class TemplateScriptingCompiler {
 			}
 			$this->popTag($tagCommand);
 			$phpCode = "<?php echo \$this->pluginObjects['".$className."']->execute(\$this->tagStack[count(\$this->tagStack) - 1][1], ob_get_clean(), \$this); }\n";
-			$phpCode .= "array_pop(\$this->tagStack);\n";
+			$phpCode .= "array_pop(\$this->tagStack);?>";
 		}
 		
 		return $phpCode;
diff --git a/wcfsetup/install/files/options.inc.php b/wcfsetup/install/files/options.inc.php
index 602509ad63..c91b1d8a18 100644
--- a/wcfsetup/install/files/options.inc.php
+++ b/wcfsetup/install/files/options.inc.php
@@ -3,9 +3,11 @@
  * default options.inc.php for package installation of package com.woltlab.wcf.
  *
  * @author	Marcel Werk 
- * @copyright	2001-2007 WoltLab GmbH
+ * @copyright	2001-2012 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  */
+define('PACKAGE_ID', 0);
+
 define('COOKIE_PREFIX', 'wcf_');
 define('COOKIE_PATH', '');
 define('COOKIE_DOMAIN', '');