From c5dd767ed8aa96d138fb6d4dfd166c1dab7269e5 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Fri, 26 Aug 2016 15:11:42 +0200 Subject: [PATCH] Remove trailing whitespace --- com.woltlab.wcf/templates/ampFooter.tpl | 4 ++-- com.woltlab.wcf/templates/article.tpl | 8 ++++---- com.woltlab.wcf/templates/header.tpl | 12 ++++++------ com.woltlab.wcf/templates/userException.tpl | 2 +- com.woltlab.wcf/templates/userOptionFieldList.tpl | 2 +- .../templates/userProfileOptionFieldList.tpl | 2 +- wcfsetup/install/files/acp/js/WCF.ACP.js | 2 +- .../install/files/acp/templates/articleList.tpl | 2 +- wcfsetup/install/files/acp/templates/footer.tpl | 12 ++++++------ .../files/acp/templates/optionFieldList.tpl | 2 +- wcfsetup/install/files/acp/templates/pageAdd.tpl | 2 +- .../install/files/acp/templates/templateList.tpl | 2 +- .../js/3rdParty/redactor2/plugins/WoltLabImage.js | 2 +- .../files/js/WoltLabSuite/Core/Date/Picker.js | 4 ++-- .../js/WoltLabSuite/Core/Media/Manager/Base.js | 2 +- .../js/WoltLabSuite/Core/Ui/ItemList/Filter.js | 2 +- .../files/js/WoltLabSuite/Core/Ui/Mobile.js | 2 +- wcfsetup/install/files/js/wcf.globalHelper.js | 2 +- .../files/lib/acp/form/PageAddForm.class.php | 2 +- .../lib/data/article/CategoryArticleList.class.php | 2 +- wcfsetup/install/files/lib/data/box/Box.class.php | 2 +- .../files/lib/data/comment/CommentAction.class.php | 2 +- .../lib/data/user/online/UserOnline.class.php | 2 +- .../files/lib/page/NotificationFeedPage.class.php | 4 ++-- .../files/lib/system/MetaTagHandler.class.php | 2 +- .../box/ArticleCategoriesBoxController.class.php | 2 +- .../cache/builder/OptionCacheBuilder.class.php | 2 +- .../condition/UserMobileBrowserCondition.class.php | 4 ++-- .../converter/ListMetacodeConverter.class.php | 2 +- .../image/adapter/ImagickImageAdapter.class.php | 2 +- .../lib/system/request/RouteHandler.class.php | 2 +- .../lib/system/session/SessionHandler.class.php | 4 ++-- .../event/AbstractUserNotificationEvent.class.php | 12 ++++++------ .../UserFollowUserNotificationObject.class.php | 2 +- wcfsetup/install/files/style/element/dl.scss | 2 +- wcfsetup/install/files/style/layout/box.scss | 14 +++++++------- wcfsetup/install/files/style/layout/content.scss | 4 ++-- wcfsetup/install/files/style/ui/alert.scss | 2 +- wcfsetup/install/files/style/ui/article.scss | 6 +++--- wcfsetup/install/files/style/ui/attachment.scss | 2 +- wcfsetup/install/files/style/ui/listSortable.scss | 2 +- wcfsetup/install/files/style/ui/message.scss | 4 ++-- wcfsetup/install/files/style/ui/popover.scss | 2 +- wcfsetup/install/files/style/ui/shareButtons.scss | 4 ++-- wcfsetup/install/files/style/ui/userProfile.scss | 2 +- wcfsetup/setup/db/install.sql | 2 +- 46 files changed, 80 insertions(+), 80 deletions(-) diff --git a/com.woltlab.wcf/templates/ampFooter.tpl b/com.woltlab.wcf/templates/ampFooter.tpl index 3b64c54fa7..cc3ab0e33d 100644 --- a/com.woltlab.wcf/templates/ampFooter.tpl +++ b/com.woltlab.wcf/templates/ampFooter.tpl @@ -6,7 +6,7 @@

{lang}wcf.menu.page.navigation{/lang}

    {foreach from=$__wcf->getBoxHandler()->getBoxByIdentifier('com.woltlab.wcf.MainMenu')->getMenu()->getMenuItemNodeList() item=menuItemNode} - {if $menuItemNode->getDepth() == 1 || $menuItemNode->getParentNode()->isActiveNode()} + {if $menuItemNode->getDepth() == 1 || $menuItemNode->getParentNode()->isActiveNode()}
  1. {lang}{$menuItemNode->title}{/lang} @@ -23,7 +23,7 @@
  2. {lang}{$menuItemNode->title}{/lang}
    3. {/foreach}
- +

{lang}wcf.menu.page.location{/lang}

    {assign var=__breadcrumbsDepth value=0} diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl index cba0627d9c..d62a8d8154 100644 --- a/com.woltlab.wcf/templates/article.tpl +++ b/com.woltlab.wcf/templates/article.tpl @@ -253,8 +253,8 @@ {if $relatedArticle->getImage()}
    {@$relatedArticle->getImage()->getThumbnailTag('tiny')}
    - {/if} - + {/if} +

    {$relatedArticle->getTitle()}

    @@ -284,7 +284,7 @@
    - {if $relatedArticle->getImage()} + {if $relatedArticle->getImage()}
    {/if} @@ -305,7 +305,7 @@ {include file='commentList'} - {/if} + {/if} {/if} {if MODULE_LIKE && ARTICLE_ENABLE_LIKE} diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl index dbe3178540..d9162ff3f9 100644 --- a/com.woltlab.wcf/templates/header.tpl +++ b/com.woltlab.wcf/templates/header.tpl @@ -78,7 +78,7 @@ {if !$sidebar|empty} {if !$sidebarOrientation|isset || $sidebarOrientation == 'left'} {@$sidebar} - {/if} + {/if} {/if} {if !$sidebarLeft|empty} @@ -88,9 +88,9 @@ {foreach from=$__wcf->getBoxHandler()->getBoxes('sidebarLeft') item=box} {@$box->render()} {/foreach} - + {event name='boxesSidebarLeftBottom'} - + {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if} {/content} @@ -110,9 +110,9 @@ {capture assign='contentDescription'}{PAGE_DESCRIPTION|language}{/capture} {elseif $__wcf->getActivePage() != null && $__wcf->getActivePage()->getTitle()} {capture assign='contentTitle'}{$__wcf->getActivePage()->getTitle()}{/capture} - {/if} + {/if} {/if} - + {if !$contentTitle|empty}
    @@ -146,7 +146,7 @@ {@$box->render()} {/foreach} {/content} -
    + {/hascontent} diff --git a/com.woltlab.wcf/templates/userException.tpl b/com.woltlab.wcf/templates/userException.tpl index ded43bf579..0ad3d6702a 100644 --- a/com.woltlab.wcf/templates/userException.tpl +++ b/com.woltlab.wcf/templates/userException.tpl @@ -17,7 +17,7 @@ diff --git a/com.woltlab.wcf/templates/userOptionFieldList.tpl b/com.woltlab.wcf/templates/userOptionFieldList.tpl index 0ac77dff58..d7e59e5d45 100644 --- a/com.woltlab.wcf/templates/userOptionFieldList.tpl +++ b/com.woltlab.wcf/templates/userOptionFieldList.tpl @@ -9,7 +9,7 @@ {if $errorType[$option->optionName] == 'empty'} {lang}wcf.global.form.error.empty{/lang} - {else} + {else} {lang}{@$langPrefix}error.{$errorType[$option->optionName]}{/lang} {/if} diff --git a/com.woltlab.wcf/templates/userProfileOptionFieldList.tpl b/com.woltlab.wcf/templates/userProfileOptionFieldList.tpl index 34dd905367..8524d4f063 100644 --- a/com.woltlab.wcf/templates/userProfileOptionFieldList.tpl +++ b/com.woltlab.wcf/templates/userProfileOptionFieldList.tpl @@ -12,7 +12,7 @@ {if $error == 'empty'} {lang}wcf.global.form.error.empty{/lang} - {else} + {else} {lang}{@$langPrefix}error.{$error}{/lang} {/if} diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js index 378610dd93..450c5ede17 100644 --- a/wcfsetup/install/files/acp/js/WCF.ACP.js +++ b/wcfsetup/install/files/acp/js/WCF.ACP.js @@ -1800,7 +1800,7 @@ WCF.ACP.Search = WCF.Search.Base.extend({ }; this._queryServer($parameters); } - } + } }, this)); }, diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl index 194de21958..194db45cbe 100644 --- a/wcfsetup/install/files/acp/templates/articleList.tpl +++ b/wcfsetup/install/files/acp/templates/articleList.tpl @@ -82,7 +82,7 @@
    {content} {assign var='linkParameters' value=''} - {if $categoryID}{capture append=linkParameters}&categoryID={@$categoryID}{/capture}{/if} + {if $categoryID}{capture append=linkParameters}&categoryID={@$categoryID}{/capture}{/if} {if $title}{capture append=linkParameters}&title={@$title|rawurlencode}{/capture}{/if} {if $content}{capture append=linkParameters}&content={@$content|rawurlencode}{/capture}{/if} {if $username}{capture append=linkParameters}&username={@$username|rawurlencode}{/capture}{/if} diff --git a/wcfsetup/install/files/acp/templates/footer.tpl b/wcfsetup/install/files/acp/templates/footer.tpl index 443ef8bfe1..1241261f05 100644 --- a/wcfsetup/install/files/acp/templates/footer.tpl +++ b/wcfsetup/install/files/acp/templates/footer.tpl @@ -2,17 +2,17 @@
    - - {include file='pageFooter'} + + {include file='pageFooter'} {include file='pageMenuMobile'} - + {event name='footer'} - + - + - + diff --git a/wcfsetup/install/files/acp/templates/optionFieldList.tpl b/wcfsetup/install/files/acp/templates/optionFieldList.tpl index e2a4d7b54f..98ebfd030e 100644 --- a/wcfsetup/install/files/acp/templates/optionFieldList.tpl +++ b/wcfsetup/install/files/acp/templates/optionFieldList.tpl @@ -12,7 +12,7 @@ {if $error == 'empty'} {lang}wcf.global.form.error.empty{/lang} - {else} + {else} {lang}{@$langPrefix}error.{$error}{/lang} {/if} diff --git a/wcfsetup/install/files/acp/templates/pageAdd.tpl b/wcfsetup/install/files/acp/templates/pageAdd.tpl index b96f57d4cc..109eec479c 100644 --- a/wcfsetup/install/files/acp/templates/pageAdd.tpl +++ b/wcfsetup/install/files/acp/templates/pageAdd.tpl @@ -184,7 +184,7 @@ {/if} - {/foreach} + {/foreach} {/if} {if $action != 'edit' || !$page->requireObjectID} diff --git a/wcfsetup/install/files/acp/templates/templateList.tpl b/wcfsetup/install/files/acp/templates/templateList.tpl index 7c0f08b0e5..f5f816af91 100644 --- a/wcfsetup/install/files/acp/templates/templateList.tpl +++ b/wcfsetup/install/files/acp/templates/templateList.tpl @@ -92,7 +92,7 @@ {if $searchTemplateName}{capture append=linkParameters}&searchTemplateName={@$searchTemplateName|rawurlencode}{/capture}{/if} {if $application}{capture append=linkParameters}&application={$application}{/capture}{/if} - {pages print=true assign=pagesLinks controller="TemplateList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} + {pages print=true assign=pagesLinks controller="TemplateList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder$linkParameters"} {/content} {/hascontent} diff --git a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabImage.js b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabImage.js index b4a9087194..8e44e783ed 100644 --- a/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabImage.js +++ b/wcfsetup/install/files/js/3rdParty/redactor2/plugins/WoltLabImage.js @@ -151,7 +151,7 @@ $.Redactor.prototype.WoltLabImage = function() { var html = ''; if (link) { - html = '' + html + ''; + html = '' + html + ''; } this.modal.close(); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js index f62fa23c36..c2c3162080 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Date/Picker.js @@ -67,7 +67,7 @@ define(['DateUtil', 'Language', 'ObjectMap', 'Dom/ChangeListener', 'Ui/Alignment } elData(element, 'value', date.getTime()); - var format = (isTimeOnly) ? 'formatTime' : ('formatDate' + (isDateTime ? 'Time' : '')); + var format = (isTimeOnly) ? 'formatTime' : ('formatDate' + (isDateTime ? 'Time' : '')); value = DateUtil[format](date); } @@ -394,7 +394,7 @@ define(['DateUtil', 'Language', 'ObjectMap', 'Dom/ChangeListener', 'Ui/Alignment } cell.classList[selectable ? 'remove' : 'add']('otherMonth'); - date.setDate(date.getDate() + 1); + date.setDate(date.getDate() + 1); } elData(_dateGrid, 'month', month); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js index 895fc727da..7790a80a41 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Media/Manager/Base.js @@ -414,7 +414,7 @@ define( buttonGroupNavigation.appendChild(buttons); var listItem = elCreate('li'); - listItem.className = 'mediaCheckbox'; + listItem.className = 'mediaCheckbox'; buttons.appendChild(listItem); var a = elCreate('a'); diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js index 7b922dfeca..865b2f8efb 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/ItemList/Filter.js @@ -175,7 +175,7 @@ define(['EventKey', 'Language', 'List', 'StringUtil', 'Dom/Util'], function (Eve innerError.className = 'innerError'; innerError.textContent = Language.get('wcf.global.filter.error.noMatches'); DomUtil.insertAfter(innerError, this._container); - } + } } } }; diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js index a7fea44cfc..e6dbdb9980 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Mobile.js @@ -156,7 +156,7 @@ define( } var navigation = elBySel('.jsMobileNavigation', message); - var quickOptions = elBySel('.messageQuickOptions', message); + var quickOptions = elBySel('.messageQuickOptions', message); if (quickOptions) { quickOptions.addEventListener(WCF_CLICK_EVENT, function (event) { diff --git a/wcfsetup/install/files/js/wcf.globalHelper.js b/wcfsetup/install/files/js/wcf.globalHelper.js index e63a32f8f4..57b2c2010b 100644 --- a/wcfsetup/install/files/js/wcf.globalHelper.js +++ b/wcfsetup/install/files/js/wcf.globalHelper.js @@ -134,7 +134,7 @@ var value = elData(element, attribute); return (value === "1" || value === "true"); - }; + }; /** * Shorthand function to hide an element by setting its 'display' value to 'none'. diff --git a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php index c15faa9129..009993da70 100644 --- a/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/PageAddForm.class.php @@ -321,7 +321,7 @@ class PageAddForm extends AbstractForm { else { throw new UserInputException('customURL_0'); } - } + } foreach ($this->customURL as $languageID => $customURL) { $this->validateCustomUrl($languageID, $customURL); diff --git a/wcfsetup/install/files/lib/data/article/CategoryArticleList.class.php b/wcfsetup/install/files/lib/data/article/CategoryArticleList.class.php index 80dbb2a586..f7fc9d9f96 100644 --- a/wcfsetup/install/files/lib/data/article/CategoryArticleList.class.php +++ b/wcfsetup/install/files/lib/data/article/CategoryArticleList.class.php @@ -33,7 +33,7 @@ class CategoryArticleList extends AccessibleArticleList { foreach ($category->getChildCategories() as $category) { if ($category->isAccessible()) { $categoryIDs[] = $category->categoryID; - } + } } } diff --git a/wcfsetup/install/files/lib/data/box/Box.class.php b/wcfsetup/install/files/lib/data/box/Box.class.php index d483fd95fc..530643329e 100644 --- a/wcfsetup/install/files/lib/data/box/Box.class.php +++ b/wcfsetup/install/files/lib/data/box/Box.class.php @@ -253,7 +253,7 @@ class Box extends DatabaseObject { * @return string */ public function render() { - if (!$this->hasContent()) return ''; + if (!$this->hasContent()) return ''; WCF::getTPL()->assign([ 'box' => $this diff --git a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php index f39953553f..0ab5789d9a 100644 --- a/wcfsetup/install/files/lib/data/comment/CommentAction.class.php +++ b/wcfsetup/install/files/lib/data/comment/CommentAction.class.php @@ -648,7 +648,7 @@ class CommentAction extends AbstractDatabaseObjectAction { * @throws SystemException */ public function getGuestDialog() { - $captchaObjectType = null; + $captchaObjectType = null; if (CAPTCHA_TYPE) { $captchaObjectType = CaptchaHandler::getInstance()->getObjectTypeByName(CAPTCHA_TYPE); diff --git a/wcfsetup/install/files/lib/data/user/online/UserOnline.class.php b/wcfsetup/install/files/lib/data/user/online/UserOnline.class.php index 3c7be16ecc..93554d1c30 100644 --- a/wcfsetup/install/files/lib/data/user/online/UserOnline.class.php +++ b/wcfsetup/install/files/lib/data/user/online/UserOnline.class.php @@ -85,7 +85,7 @@ class UserOnline extends UserProfile { } } - return ($this->location != ''); + return ($this->location != ''); } } } diff --git a/wcfsetup/install/files/lib/page/NotificationFeedPage.class.php b/wcfsetup/install/files/lib/page/NotificationFeedPage.class.php index 6c9a605f5e..6d754e68f3 100644 --- a/wcfsetup/install/files/lib/page/NotificationFeedPage.class.php +++ b/wcfsetup/install/files/lib/page/NotificationFeedPage.class.php @@ -21,7 +21,7 @@ class NotificationFeedPage extends AbstractFeedPage { parent::readParameters(); if (!WCF::getUser()->userID) { - throw new IllegalLinkException(); + throw new IllegalLinkException(); } $this->title = WCF::getLanguage()->get('wcf.user.menu.community.notification'); @@ -39,6 +39,6 @@ class NotificationFeedPage extends AbstractFeedPage { foreach ($notifications['notifications'] as $notification) { $this->items->append($notification['event']); - } + } } } diff --git a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php index 60fff05b5a..b20c817e74 100644 --- a/wcfsetup/install/files/lib/system/MetaTagHandler.class.php +++ b/wcfsetup/install/files/lib/system/MetaTagHandler.class.php @@ -42,7 +42,7 @@ class MetaTagHandler extends SingletonFactory implements \Countable, \Iterator { } if ($value = WCF::getLanguage()->get(PAGE_TITLE)) { $this->addTag('og:site_name', 'og:site_name', $value, true); - } + } } /** diff --git a/wcfsetup/install/files/lib/system/box/ArticleCategoriesBoxController.class.php b/wcfsetup/install/files/lib/system/box/ArticleCategoriesBoxController.class.php index 24abad0ed2..14d5943dee 100644 --- a/wcfsetup/install/files/lib/system/box/ArticleCategoriesBoxController.class.php +++ b/wcfsetup/install/files/lib/system/box/ArticleCategoriesBoxController.class.php @@ -40,6 +40,6 @@ class ArticleCategoriesBoxController extends AbstractBoxController { } $this->content = WCF::getTPL()->fetch('boxArticleCategories', 'wcf', ['categoryList' => $categoryList, 'activeCategory' => $activeCategory]); - } + } } } diff --git a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php index 20e53c7ac6..cb3160fd71 100644 --- a/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/OptionCacheBuilder.class.php @@ -29,7 +29,7 @@ class OptionCacheBuilder extends AbstractCacheBuilder { * application * @var string */ - protected $application = 'wcf'; + protected $application = 'wcf'; /** * @inheritDoc diff --git a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php index 3f419daf2a..6a26f21925 100644 --- a/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php +++ b/wcfsetup/install/files/lib/system/condition/UserMobileBrowserCondition.class.php @@ -81,7 +81,7 @@ HTML; */ public function reset() { $this->usesMobileBrowser = 0; - $this->usesNoMobileBrowser = 0; + $this->usesNoMobileBrowser = 0; } /** @@ -89,7 +89,7 @@ HTML; */ public function setData(Condition $condition) { $this->usesMobileBrowser = $condition->usesMobileBrowser; - $this->usesNoMobileBrowser = !$condition->usesMobileBrowser; + $this->usesNoMobileBrowser = !$condition->usesMobileBrowser; } /** diff --git a/wcfsetup/install/files/lib/system/html/metacode/converter/ListMetacodeConverter.class.php b/wcfsetup/install/files/lib/system/html/metacode/converter/ListMetacodeConverter.class.php index 7ae0263554..e0b311463a 100644 --- a/wcfsetup/install/files/lib/system/html/metacode/converter/ListMetacodeConverter.class.php +++ b/wcfsetup/install/files/lib/system/html/metacode/converter/ListMetacodeConverter.class.php @@ -69,7 +69,7 @@ class ListMetacodeConverter extends AbstractMetacodeConverter { // split before each target node foreach ($targetNodes as $targetNode) { - DOMUtil::splitParentsUntil($targetNode, $element); + DOMUtil::splitParentsUntil($targetNode, $element); } $ancestors = []; foreach ($targetNodes as $targetNode) { diff --git a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php index 874ac3cb53..f06caa2999 100644 --- a/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php +++ b/wcfsetup/install/files/lib/system/image/adapter/ImagickImageAdapter.class.php @@ -129,7 +129,7 @@ class ImagickImageAdapter implements IImageAdapter { $thumbnail->cropThumbnailImage($maxWidth, $maxHeight); } - $thumbnail->setImagePage($maxWidth, $maxHeight, 0, 0); + $thumbnail->setImagePage($maxWidth, $maxHeight, 0, 0); } while ($thumbnail->nextImage()); } diff --git a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php index 6f60322867..6808d7bfd1 100644 --- a/wcfsetup/install/files/lib/system/request/RouteHandler.class.php +++ b/wcfsetup/install/files/lib/system/request/RouteHandler.class.php @@ -109,7 +109,7 @@ class RouteHandler extends SingletonFactory { * @return IRequestRoute[] **/ public function getRoutes() { - return $this->routes; + return $this->routes; } /** diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index 5a5056db48..c568cb0a71 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -709,11 +709,11 @@ class SessionHandler extends SingletonFactory { * @param boolean $hideSession if true, database won't be updated */ public function changeUser(User $user, $hideSession = false) { - $eventParameters = ['user' => $user, 'hideSession' => $hideSession]; + $eventParameters = ['user' => $user, 'hideSession' => $hideSession]; EventHandler::getInstance()->fireAction($this, 'beforeChangeUser', $eventParameters); - $user = $eventParameters['user']; + $user = $eventParameters['user']; $hideSession = $eventParameters['hideSession']; // skip changeUserVirtual, if session will not be persistent anyway diff --git a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php index 3b5a50b5f0..015fe64e97 100644 --- a/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/event/AbstractUserNotificationEvent.class.php @@ -254,7 +254,7 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp * @inheritDoc */ public function getComments() { - return 0; + return 0; } /** @@ -277,34 +277,34 @@ abstract class AbstractUserNotificationEvent extends DatabaseObjectDecorator imp * @inheritDoc */ public function getFormattedMessage() { - return $this->getMessage(); + return $this->getMessage(); } /** * @inheritDoc */ public function __toString() { - return $this->getFormattedMessage(); + return $this->getFormattedMessage(); } /** * @inheritDoc */ public function getTime() { - return $this->getNotification()->time; + return $this->getNotification()->time; } /** * @inheritDoc */ public function getUserID() { - return $this->getAuthorID(); + return $this->getAuthorID(); } /** * @inheritDoc */ public function getUsername() { - return $this->getAuthor()->username; + return $this->getAuthor()->username; } } diff --git a/wcfsetup/install/files/lib/system/user/notification/object/UserFollowUserNotificationObject.class.php b/wcfsetup/install/files/lib/system/user/notification/object/UserFollowUserNotificationObject.class.php index 42caf1a08f..130e3baa60 100644 --- a/wcfsetup/install/files/lib/system/user/notification/object/UserFollowUserNotificationObject.class.php +++ b/wcfsetup/install/files/lib/system/user/notification/object/UserFollowUserNotificationObject.class.php @@ -45,6 +45,6 @@ class UserFollowUserNotificationObject extends DatabaseObjectDecorator implement * @inheritDoc */ public function getRelatedObjectID() { - return $this->followUserID; + return $this->followUserID; } } diff --git a/wcfsetup/install/files/style/element/dl.scss b/wcfsetup/install/files/style/element/dl.scss index aa648d30ad..30f395f749 100644 --- a/wcfsetup/install/files/style/element/dl.scss +++ b/wcfsetup/install/files/style/element/dl.scss @@ -35,7 +35,7 @@ dl { /* indentation for checkbox descriptions */ + small:not(.innerError) { margin-left: 24px; - } + } } > label:not(:first-child) { diff --git a/wcfsetup/install/files/style/layout/box.scss b/wcfsetup/install/files/style/layout/box.scss index e8136712d6..875d46b9d4 100644 --- a/wcfsetup/install/files/style/layout/box.scss +++ b/wcfsetup/install/files/style/layout/box.scss @@ -64,7 +64,7 @@ @include screen-lg { margin-bottom: 60px; } - } + } } .boxTitle { @@ -280,13 +280,13 @@ } } } - } + } } .boxesTop { border-bottom: 1px solid $wcfContentBorderInner; -} - +} + .boxesBottom { border-top: 1px solid $wcfContentBorderInner; } @@ -478,7 +478,7 @@ max-height: 100px; overflow: hidden; } - } + } } /* styling for boxes in / position */ @@ -535,7 +535,7 @@ float: left; width: 30%; } - } + } } .boxesContentTop:not(:first-child) { @@ -594,7 +594,7 @@ @include screen-sm-down { &:not(:last-child) { margin-bottom: 40px; - } + } } @include screen-md-up { diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss index 0250711356..78d3aa4b7b 100644 --- a/wcfsetup/install/files/style/layout/content.scss +++ b/wcfsetup/install/files/style/layout/content.scss @@ -158,7 +158,7 @@ + .section { margin-top: 20px; - } + } } &:not(.sectionContainerList) { @@ -248,7 +248,7 @@ fieldset { @include wcfFontHeadline; } - } + } } /* styling for container headlines */ diff --git a/wcfsetup/install/files/style/ui/alert.scss b/wcfsetup/install/files/style/ui/alert.scss index 5af149053b..2095948de9 100644 --- a/wcfsetup/install/files/style/ui/alert.scss +++ b/wcfsetup/install/files/style/ui/alert.scss @@ -85,7 +85,7 @@ border-top-width: 1px; border-top-style: solid; margin-top: 0; - } + } } /* inline infos */ diff --git a/wcfsetup/install/files/style/ui/article.scss b/wcfsetup/install/files/style/ui/article.scss index d37bee7984..6aced5cb40 100644 --- a/wcfsetup/install/files/style/ui/article.scss +++ b/wcfsetup/install/files/style/ui/article.scss @@ -144,7 +144,7 @@ > div { margin-left: 36px; } - } + } } .nextArticleButton { @@ -153,7 +153,7 @@ @include screen-md-up { margin-left: 50%; padding-left: 10px; - } + } .articleNavigationArticleImage { order: 1; @@ -271,7 +271,7 @@ flex: 0 0 calc(100%/6 - 10px); max-width: calc(100%/6 - 10px); } - } + } } } diff --git a/wcfsetup/install/files/style/ui/attachment.scss b/wcfsetup/install/files/style/ui/attachment.scss index 5a99cd28e1..b15b2b6ed5 100644 --- a/wcfsetup/install/files/style/ui/attachment.scss +++ b/wcfsetup/install/files/style/ui/attachment.scss @@ -70,7 +70,7 @@ .attachmentThumbnailImage { img { opacity: 1; - } + } } } diff --git a/wcfsetup/install/files/style/ui/listSortable.scss b/wcfsetup/install/files/style/ui/listSortable.scss index 2e362e6b4d..b2404c1d57 100644 --- a/wcfsetup/install/files/style/ui/listSortable.scss +++ b/wcfsetup/install/files/style/ui/listSortable.scss @@ -48,7 +48,7 @@ flex: 0 0 auto; margin-left: 5px; } - } + } } .sortablePlaceholder { diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss index d41d6d1b42..7d75d563fc 100644 --- a/wcfsetup/install/files/style/ui/message.scss +++ b/wcfsetup/install/files/style/ui/message.scss @@ -565,7 +565,7 @@ @include screen-md-up { padding: 10px 20px; - } + } } @include screen-md-up { @@ -573,7 +573,7 @@ .messageFooter { padding: 0 20px; } - } + } } .messageQuoteItemList { diff --git a/wcfsetup/install/files/style/ui/popover.scss b/wcfsetup/install/files/style/ui/popover.scss index 6ae82eaaa9..4cdd72697f 100644 --- a/wcfsetup/install/files/style/ui/popover.scss +++ b/wcfsetup/install/files/style/ui/popover.scss @@ -33,7 +33,7 @@ } > .elementPointer { - display: none; + display: none; } } diff --git a/wcfsetup/install/files/style/ui/shareButtons.scss b/wcfsetup/install/files/style/ui/shareButtons.scss index e17b26c9d9..3c52c51542 100644 --- a/wcfsetup/install/files/style/ui/shareButtons.scss +++ b/wcfsetup/install/files/style/ui/shareButtons.scss @@ -24,7 +24,7 @@ $shareXingBackground: rgba(0, 101, 103, 1); @include screen-sm-down { > span:not(.icon) { display: none; - } + } } } @@ -32,7 +32,7 @@ $shareXingBackground: rgba(0, 101, 103, 1); .icon { margin-right: 3px; } - } + } .jsShareFacebook { background-color: $shareFacebookBackground; diff --git a/wcfsetup/install/files/style/ui/userProfile.scss b/wcfsetup/install/files/style/ui/userProfile.scss index 33308b4f68..3dfce24ac5 100644 --- a/wcfsetup/install/files/style/ui/userProfile.scss +++ b/wcfsetup/install/files/style/ui/userProfile.scss @@ -132,7 +132,7 @@ padding: 1px; } } - } + } } } diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql index d42a6c78ea..878a027fe4 100644 --- a/wcfsetup/setup/db/install.sql +++ b/wcfsetup/setup/db/install.sql @@ -1737,7 +1737,7 @@ ALTER TABLE wcf1_media ADD FOREIGN KEY (languageID) REFERENCES wcf1_language (la ALTER TABLE wcf1_media_content ADD FOREIGN KEY (mediaID) REFERENCES wcf1_media (mediaID) ON DELETE CASCADE; ALTER TABLE wcf1_media_content ADD FOREIGN KEY (languageID) REFERENCES wcf1_language (languageID) ON DELETE CASCADE; -ALTER TABLE wcf1_menu ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE; +ALTER TABLE wcf1_menu ADD FOREIGN KEY (packageID) REFERENCES wcf1_package (packageID) ON DELETE CASCADE; ALTER TABLE wcf1_menu_item ADD FOREIGN KEY (menuID) REFERENCES wcf1_menu (menuID) ON DELETE CASCADE; ALTER TABLE wcf1_menu_item ADD FOREIGN KEY (parentItemID) REFERENCES wcf1_menu_item (itemID) ON DELETE SET NULL; -- 2.20.1