From a37b39b621ccd0f8accee61b9730bba2b9ed85f0 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Tue, 21 May 2013 14:26:25 +0200 Subject: [PATCH] Fixed package id associations --- wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php | 4 ++-- .../install/files/lib/acp/form/BBCodeEditForm.class.php | 2 +- wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php | 2 +- wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php | 6 +++--- .../install/files/lib/acp/form/SmileyEditForm.class.php | 2 +- .../install/files/lib/acp/form/UserRankAddForm.class.php | 2 +- .../install/files/lib/acp/form/UserRankEditForm.class.php | 6 +++--- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php index fdee91d406..c22883f59c 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php @@ -218,7 +218,7 @@ class BBCodeAddForm extends AbstractForm { 'htmlOpen' => $this->htmlOpen, 'htmlClose' => $this->htmlClose, 'isSourceCode' => ($this->isSourceCode ? 1 : 0), - 'packageID' => PackageCache::getInstance()->getPackageID('com.woltlab.wcf.bbcode'), + 'packageID' => 1, 'showButton' => ($this->showButton ? 1 : 0), 'wysiwygIcon' => $this->wysiwygIcon ))); @@ -237,7 +237,7 @@ class BBCodeAddForm extends AbstractForm { if ($this->showButton && !I18nHandler::getInstance()->isPlainValue('buttonLabel')) { $bbcodeID = $returnValues['returnValues']->bbcodeID; - I18nHandler::getInstance()->save('buttonLabel', 'wcf.bbcode.buttonLabel'.$bbcodeID, 'wcf.bbcode', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.bbcode')); + I18nHandler::getInstance()->save('buttonLabel', 'wcf.bbcode.buttonLabel'.$bbcodeID, 'wcf.bbcode', 1); // update button label $bbcodeEditor = new BBCodeEditor($returnValues['returnValues']); diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php index 66c9a52129..cddc35c06f 100644 --- a/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/BBCodeEditForm.class.php @@ -75,7 +75,7 @@ class BBCodeEditForm extends BBCodeAddForm { $this->buttonLabel = I18nHandler::getInstance()->getValue('buttonLabel'); } else { - I18nHandler::getInstance()->save('buttonLabel', $this->buttonLabel, 'wcf.bbcode', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.bbcode')); + I18nHandler::getInstance()->save('buttonLabel', $this->buttonLabel, 'wcf.bbcode', 1); } } diff --git a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php index feee0636a5..1a24dba2de 100644 --- a/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LabelAddForm.class.php @@ -159,7 +159,7 @@ class LabelAddForm extends AbstractForm { if (!I18nHandler::getInstance()->isPlainValue('label')) { $returnValues = $this->objectAction->getReturnValues(); $labelID = $returnValues['returnValues']->labelID; - I18nHandler::getInstance()->save('label', 'wcf.acp.label.label'.$labelID, 'wcf.acp.label', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.label')); + I18nHandler::getInstance()->save('label', 'wcf.acp.label.label'.$labelID, 'wcf.acp.label', 1); // update group name $labelEditor = new LabelEditor($returnValues['returnValues']); diff --git a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php index 9509def5b7..58f2023100 100644 --- a/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LabelEditForm.class.php @@ -62,11 +62,11 @@ class LabelEditForm extends LabelAddForm { $this->label = 'wcf.acp.label.label'.$this->labelObj->labelID; if (I18nHandler::getInstance()->isPlainValue('label')) { - I18nHandler::getInstance()->remove($this->label, PackageCache::getInstance()->getPackageID('com.woltlab.wcf.label')); + I18nHandler::getInstance()->remove($this->label, 1); $this->label = I18nHandler::getInstance()->getValue('label'); } else { - I18nHandler::getInstance()->save('label', $this->label, 'wcf.acp.label', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.label')); + I18nHandler::getInstance()->save('label', $this->label, 'wcf.acp.label', 1); } // update label @@ -95,7 +95,7 @@ class LabelEditForm extends LabelAddForm { parent::readData(); if (empty($_POST)) { - I18nHandler::getInstance()->setOptions('label', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.label'), $this->labelObj->label, 'wcf.acp.label.label\d+'); + I18nHandler::getInstance()->setOptions('label', 1, $this->labelObj->label, 'wcf.acp.label.label\d+'); $this->label = $this->labelObj->label; $this->cssClassName = $this->labelObj->cssClassName; diff --git a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php index 4ecaa9c805..694fff843f 100644 --- a/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/SmileyEditForm.class.php @@ -66,7 +66,7 @@ class SmileyEditForm extends SmileyAddForm { $this->smileyTitle = I18nHandler::getInstance()->getValue('smileyTitle'); } else { - I18nHandler::getInstance()->save('smileyTitle', $this->smileyTitle, 'wcf.smiley', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.bbcode')); + I18nHandler::getInstance()->save('smileyTitle', $this->smileyTitle, 'wcf.smiley', 1); } // update bbcode diff --git a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php index 0f696fe33f..b9ea461267 100644 --- a/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserRankAddForm.class.php @@ -191,7 +191,7 @@ class UserRankAddForm extends AbstractForm { if (!I18nHandler::getInstance()->isPlainValue('rankTitle')) { $returnValues = $this->objectAction->getReturnValues(); $rankID = $returnValues['returnValues']->rankID; - I18nHandler::getInstance()->save('rankTitle', 'wcf.user.rank.userRank'.$rankID, 'wcf.user', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.user')); + I18nHandler::getInstance()->save('rankTitle', 'wcf.user.rank.userRank'.$rankID, 'wcf.user', 1); // update name $rankEditor = new UserRankEditor($returnValues['returnValues']); diff --git a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php index 26e56d6ffb..031bd6bb6a 100644 --- a/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserRankEditForm.class.php @@ -57,11 +57,11 @@ class UserRankEditForm extends UserRankAddForm { $this->rankTitle = 'wcf.user.rank.userRank'.$this->rank->rankID; if (I18nHandler::getInstance()->isPlainValue('rankTitle')) { - I18nHandler::getInstance()->remove($this->rankTitle, PackageCache::getInstance()->getPackageID('com.woltlab.wcf.user')); + I18nHandler::getInstance()->remove($this->rankTitle, 1); $this->rankTitle = I18nHandler::getInstance()->getValue('rankTitle'); } else { - I18nHandler::getInstance()->save('rankTitle', $this->rankTitle, 'wcf.user', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.user')); + I18nHandler::getInstance()->save('rankTitle', $this->rankTitle, 'wcf.user', 1); } // update label @@ -93,7 +93,7 @@ class UserRankEditForm extends UserRankAddForm { parent::readData(); if (empty($_POST)) { - I18nHandler::getInstance()->setOptions('rankTitle', PackageCache::getInstance()->getPackageID('com.woltlab.wcf.user'), $this->rank->rankTitle, 'wcf.user.rank.userRank\d+'); + I18nHandler::getInstance()->setOptions('rankTitle', 1, $this->rank->rankTitle, 'wcf.user.rank.userRank\d+'); $this->rankTitle = $this->rank->rankTitle; $this->cssClassName = $this->rank->cssClassName; if (!in_array($this->cssClassName, $this->availableCssClassNames)) { -- 2.20.1