From e3fc42e86f2b52e0a6df25aac3ef4a532bbc6a17 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sat, 6 Apr 2013 11:50:48 +0200 Subject: [PATCH] Fixes name of called method MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … and does some minor cleanup --- .../package/PackageInstallationDispatcher.class.php | 10 +++++----- .../package/PackageUninstallationDispatcher.class.php | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php index 09cc75e676..532c23453f 100644 --- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php @@ -177,15 +177,15 @@ class PackageInstallationDispatcher { // reset stylesheets StyleHandler::resetStylesheets(); - // reset user storage - UserStorageHandler::getInstance()->resetAll(); + // clear user storage + UserStorageHandler::getInstance()->clear(); EventHandler::getInstance()->fireAction($this, 'postInstall'); - } + } if ($this->requireRestructureVersionTables) { $this->restructureVersionTables(); - } + } return $step; } @@ -984,7 +984,7 @@ class PackageInstallationDispatcher { $versionTableBaseColumns[] = array('name' => 'versionUsername', 'data' => array('type' => 'VARCHAR', 'length' => 255)); $versionTableBaseColumns[] = array('name' => 'versionTime', 'data' => array('type' => 'INT')); - foreach ($objectTypes as $objectTypeID => $objectType) { + foreach ($objectTypes as $objectType) { // get structure of base table $baseTableColumns = WCF::getDB()->getEditor()->getColumns($objectType::getDatabaseTableName()); // get structure of version table diff --git a/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php index a241b34d2b..7842e57574 100644 --- a/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php @@ -87,15 +87,15 @@ class PackageUninstallationDispatcher extends PackageInstallationDispatcher { // rebuild application paths ApplicationHandler::rebuild(); - // reset user storage - UserStorageHandler::getInstance()->resetAll(); + // clear user storage + UserStorageHandler::getInstance()->clear(); EventHandler::getInstance()->fireAction($this, 'postUninstall'); } if ($this->requireRestructureVersionTables) { $this->restructureVersionTables(); - } + } // return next node return $node; -- 2.20.1