From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 9 Aug 2011 15:35:07 +0000 (+0200)
Subject: Fixed creation of the options.inc.php file
X-Git-Tag: 2.0.0_Beta_1~1899
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ba8be2195c6caea124ddc0120198b558349c060;p=GitHub%2FWoltLab%2FWCF.git

Fixed creation of the options.inc.php file
---

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index f5d64616ea..b00e09dfd2 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -310,12 +310,12 @@ class WCF {
 	 * 
 	 * @param	string		$filename
 	 */
-	protected function loadOptions($filename = null) {
+	protected function loadOptions($filename = null, $packageID = 1) {
 		if ($filename === null) $filename = WCF_DIR.'options.inc.php';
 		
 		// create options file if doesn't exist
 		if (!file_exists($filename) || filemtime($filename) <= 1) {
-			\wcf\data\option\OptionEditor::rebuildFile($filename);
+			\wcf\data\option\OptionEditor::rebuildFile($filename, $packageID);
 		}
 		require_once($filename);
 	}
@@ -441,7 +441,7 @@ class WCF {
 		
 		// load options
 		if (!$isDepedentApplication) {
-			$this->loadOptions($packageDir.'options.inc.php');
+			$this->loadOptions($packageDir.'options.inc.php', $application->packageID);
 		}
 	}