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 95b0698c6ebce532ca619979f9e920c7adbd1ae0..a9a0f7c08194d5bee97d7538183b0e9abf75b70c 100644 (file)
--- 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 df84c98de47d5e582024610869c3322b8c677658..d1dda3fc178e3137053962955f15172837e92520 100644 (file)
--- 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 602509ad63abf01972e4a7a862c7b9b999e7d735..c91b1d8a187518cdd36e3270d4a3e10215bb63e7 100644 (file)
--- 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', '');