From ce765861aeb22a8c802e67f2c0d6dd6638ae885c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Wed, 14 Jun 2017 17:00:53 +0200 Subject: [PATCH] clean up code --- wcfsetup/install/files/acp/templates/sitemapList.tpl | 2 +- .../files/lib/acp/form/SitemapEditForm.class.php | 10 +++++----- .../object/ArticleCategorySitemapObject.class.php | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/sitemapList.tpl b/wcfsetup/install/files/acp/templates/sitemapList.tpl index e58164cdb0..405f464c5c 100755 --- a/wcfsetup/install/files/acp/templates/sitemapList.tpl +++ b/wcfsetup/install/files/acp/templates/sitemapList.tpl @@ -64,7 +64,7 @@ require(['Language'], function(Language) { Language.add('wcf.acp.worker.abort.confirmMessage', '{lang}wcf.acp.worker.abort.confirmMessage{/lang}'); - elById("sitemapRebuildButton").addEventListener(WCF_CLICK_EVENT, function () { + elById('sitemapRebuildButton').addEventListener(WCF_CLICK_EVENT, function () { new WCF.ACP.Worker('sitemapRebuild', 'wcf\\system\\worker\\SitemapRebuildWorker', '{lang}wcf.acp.rebuildData.com.woltlab.wcf.sitemap{/lang}', { forceRebuild: true }); diff --git a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php index 5b4dd2f761..9b94c075b6 100755 --- a/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/SitemapEditForm.class.php @@ -152,17 +152,17 @@ class SitemapEditForm extends AbstractForm { 'isDisabled' => $this->isDisabled ]); - (new ObjectTypeAction([$this->objectType], 'update', [ + $this->objectAction = new ObjectTypeAction([$this->objectType], 'update', [ 'data' => [ 'additionalData' => serialize($data) ] - ]))->executeAction(); + ]); + $this->objectAction->executeAction(); $this->saved(); - WCF::getTPL()->assign([ - 'success' => true - ]); + // show success message + WCF::getTPL()->assign('success', true); } /** diff --git a/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php b/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php index 1585928ba7..2d4993102f 100644 --- a/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php +++ b/wcfsetup/install/files/lib/system/sitemap/object/ArticleCategorySitemapObject.class.php @@ -4,7 +4,6 @@ use wcf\data\article\category\ArticleCategory; use wcf\data\category\CategoryList; use wcf\data\object\type\ObjectTypeCache; use wcf\data\DatabaseObject; -use wcf\system\WCF; /** * Article category sitemap implementation. @@ -39,6 +38,6 @@ class ArticleCategorySitemapObject extends AbstractSitemapObjectObjectType { */ public function canView(DatabaseObject $object) { /** @var $object ArticleCategory */ - return $object->isAccessible(WCF::getUser()); + return $object->isAccessible(); } } -- 2.20.1