Fixed creation of the options.inc.php file
authorMarcel Werk <burntime@woltlab.com>
Tue, 9 Aug 2011 15:35:07 +0000 (17:35 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 9 Aug 2011 15:35:07 +0000 (17:35 +0200)
wcfsetup/install/files/lib/system/WCF.class.php

index f5d64616ea58c251208b702abac22c99a0bfe89e..b00e09dfd2da2588bf33c40ec578492bf9842ad5 100644 (file)
@@ -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);
                }
        }