Fixed package id associations

diff --git a/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php b/wcfsetup/install/files/lib/acp/form/BBCodeAddForm.class.php
index fdee91d406e21ef73e7fb1bfb29d25338d0fae36..c22883f59c19f8e8b26839d5729db4d629d89898 100644 (file)
--- 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 66c9a521296e4aee35c60b1d0c31917841f36ed5..cddc35c06f72276852ba10a33e7c64024aebf352 100644 (file)
--- 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 feee0636a5cfc32214c254880d88db91fff5b0bd..1a24dba2de8c1f84a921ba566c31f460d4db282f 100644 (file)
--- 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 9509def5b7d457456b41ff686da39de778b36a6d..58f2023100a47fe361b571c75aafa811f1028567 100644 (file)
--- 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 4ecaa9c805318442851199b7d9b9add55248dc9e..694fff843f6bb8c380fc2f8bb061c7c402b95f85 100644 (file)
--- 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 0f696fe33f1612c3a6c63ba6f89344615ee80ca2..b9ea461267924bba9c74bcbf831b9dcb9ee826d8 100644 (file)
--- 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 26e56d6ffb1d0ba5bc4dfb3177fdb87b17c40c29..031bd6bb6a037090f579075eb64650406fbd030b 100644 (file)
--- 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)) {