From d82f6ebe5ddf2d966b4b1e76be4f56186f97da58 Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Mon, 10 Mar 2014 20:57:21 +0100 Subject: [PATCH] Changed default value for package id --- wcfsetup/install/files/lib/data/style/StyleAction.class.php | 1 - wcfsetup/install/files/lib/data/style/StyleEditor.class.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/data/style/StyleAction.class.php b/wcfsetup/install/files/lib/data/style/StyleAction.class.php index 6ece4b954e..78c1cc6c71 100644 --- a/wcfsetup/install/files/lib/data/style/StyleAction.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleAction.class.php @@ -403,7 +403,6 @@ class StyleAction extends AbstractDatabaseObjectAction implements IToggleAction // create the new style $newStyle = StyleEditor::create(array( - 'packageID' => PACKAGE_ID, 'styleName' => $styleName, 'templateGroupID' => $this->styleEditor->templateGroupID, 'isDisabled' => 1, // newly created styles are disabled by default diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php index 1add0db2cb..4b69fa0d88 100644 --- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php +++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php @@ -291,7 +291,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject * @param StyleEditor $style * @return StyleEditor */ - public static function import($filename, $packageID = PACKAGE_ID, StyleEditor $style = null) { + public static function import($filename, $packageID = 1, StyleEditor $style = null) { // open file $tar = new Tar($filename); @@ -838,7 +838,7 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject } // default values - if (!isset($parameters['packageID'])) $parameters['packageID'] = PACKAGE_ID; + if (!isset($parameters['packageID'])) $parameters['packageID'] = 1; if (!isset($parameters['styleDate'])) $parameters['styleDate'] = gmdate('Y-m-d', TIME_NOW); // check if no default style is defined -- 2.20.1