From ef1f5b4a0268d7d70cc2bd4152853d59801660cf Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Tue, 14 Jun 2016 12:20:32 +0200 Subject: [PATCH] Revert "Removed obsolete trailing slashes from void elements" This reverts commit 7cdfcfbcce56375ed5a35b6177fe910000bb0fc9. --- .../templates/__messageFormPoll.tpl | 14 ++-- .../templates/__messageFormSmilies.tpl | 2 +- .../templates/accountManagement.tpl | 28 ++++---- com.woltlab.wcf/templates/article.tpl | 6 +- com.woltlab.wcf/templates/articleList.tpl | 8 +-- com.woltlab.wcf/templates/attachments.tpl | 4 +- com.woltlab.wcf/templates/avatarEdit.tpl | 12 ++-- com.woltlab.wcf/templates/benchmark.tpl | 2 +- .../birthdaySearchableOptionType.tpl | 4 +- com.woltlab.wcf/templates/captchaQuestion.tpl | 4 +- .../templates/categoryArticleList.tpl | 8 +-- .../templates/checkboxesOptionType.tpl | 2 +- .../checkboxesSearchableOptionType.tpl | 4 +- .../templates/commentAddGuestDialog.tpl | 4 +- com.woltlab.wcf/templates/disclaimer.tpl | 2 +- com.woltlab.wcf/templates/editHistory.tpl | 14 ++-- com.woltlab.wcf/templates/emailActivation.tpl | 6 +- .../templates/emailNewActivationCode.tpl | 6 +- .../templates/flexibleCategoryList.tpl | 6 +- .../templates/integerOptionType.tpl | 2 +- com.woltlab.wcf/templates/login.tpl | 4 +- com.woltlab.wcf/templates/lostPassword.tpl | 6 +- com.woltlab.wcf/templates/mail.tpl | 8 +-- .../templates/manageSubscription.tpl | 6 +- com.woltlab.wcf/templates/mediaEditor.tpl | 6 +- com.woltlab.wcf/templates/mediaListItems.tpl | 2 +- com.woltlab.wcf/templates/membersList.tpl | 12 ++-- .../templates/messageFormAttachments.tpl | 4 +- .../templates/messageQuoteList.tpl | 4 +- .../templates/moderationQueueAssignUser.tpl | 10 +-- .../multiSelectSearchableOptionType.tpl | 2 +- com.woltlab.wcf/templates/newPassword.tpl | 6 +- .../templates/notificationList.tpl | 2 +- .../templates/notificationSettings.tpl | 2 +- .../templates/paidSubscriptionList.tpl | 2 +- com.woltlab.wcf/templates/pollVote.tpl | 2 +- .../templates/radioButtonOptionType.tpl | 2 +- .../radioButtonSearchableOptionType.tpl | 4 +- com.woltlab.wcf/templates/recaptcha.tpl | 6 +- .../templates/recentActivityList.tpl | 2 +- com.woltlab.wcf/templates/redirect.tpl | 2 +- com.woltlab.wcf/templates/register.tpl | 18 ++--- .../templates/registerActivation.tpl | 6 +- .../templates/registerNewActivationCode.tpl | 8 +-- com.woltlab.wcf/templates/search.tpl | 16 ++--- com.woltlab.wcf/templates/searchArticle.tpl | 2 +- .../templates/selectSearchableOptionType.tpl | 2 +- com.woltlab.wcf/templates/settings.tpl | 6 +- .../templates/shareButtonsPrivacySettings.tpl | 10 +-- com.woltlab.wcf/templates/signatureEdit.tpl | 2 +- com.woltlab.wcf/templates/styleChooser.tpl | 2 +- com.woltlab.wcf/templates/tagInput.tpl | 2 +- com.woltlab.wcf/templates/tagged.tpl | 6 +- com.woltlab.wcf/templates/team.tpl | 2 +- .../templates/textI18nOptionType.tpl | 2 +- com.woltlab.wcf/templates/textOptionType.tpl | 2 +- .../templates/textSearchableOptionType.tpl | 4 +- .../textareaSearchableOptionType.tpl | 2 +- com.woltlab.wcf/templates/user.tpl | 2 +- com.woltlab.wcf/templates/userException.tpl | 2 +- .../templates/userProfileAboutEditable.tpl | 2 +- com.woltlab.wcf/templates/userSearch.tpl | 4 +- com.woltlab.wcf/templates/usersOnlineList.tpl | 10 +-- wcfsetup/install.php | 16 ++--- wcfsetup/install/files/acp/dereferrer.php | 2 +- .../files/acp/templates/acpSessionLogList.tpl | 2 +- .../install/files/acp/templates/adAdd.tpl | 8 +-- .../files/acp/templates/applicationEdit.tpl | 8 +-- .../files/acp/templates/articleAdd.tpl | 26 ++++---- .../files/acp/templates/articleList.tpl | 10 +-- .../files/acp/templates/attachmentList.tpl | 8 +-- .../acp/templates/bbCodeSelectOptionType.tpl | 2 +- .../install/files/acp/templates/bbcodeAdd.tpl | 34 +++++----- .../acp/templates/bbcodeMediaProviderAdd.tpl | 4 +- .../install/files/acp/templates/benchmark.tpl | 2 +- .../birthdaySearchableOptionType.tpl | 4 +- .../install/files/acp/templates/boxAdd.tpl | 32 ++++----- .../files/acp/templates/boxConditions.tpl | 2 +- .../install/files/acp/templates/boxList.tpl | 8 +-- .../files/acp/templates/bulkProcessing.tpl | 4 +- .../files/acp/templates/captchaQuestion.tpl | 4 +- .../acp/templates/captchaQuestionAdd.tpl | 6 +- .../files/acp/templates/categoryAdd.tpl | 8 +-- .../acp/templates/checkboxesOptionType.tpl | 2 +- .../checkboxesSearchableOptionType.tpl | 4 +- .../files/acp/templates/cronjobAdd.tpl | 16 ++--- .../files/acp/templates/dataImport.tpl | 28 ++++---- .../files/acp/templates/exceptionLogView.tpl | 4 +- .../exportMailAddressUserBulkProcessing.tpl | 8 +-- .../files/acp/templates/fileOptionType.tpl | 4 +- .../install/files/acp/templates/labelAdd.tpl | 10 +-- .../files/acp/templates/labelGroupAdd.tpl | 12 ++-- .../install/files/acp/templates/labelList.tpl | 6 +- .../files/acp/templates/languageAdd.tpl | 8 +-- .../files/acp/templates/languageExport.tpl | 4 +- .../files/acp/templates/languageImport.tpl | 4 +- .../acp/templates/languageItemEditDialog.tpl | 4 +- .../files/acp/templates/languageItemList.tpl | 8 +-- .../acp/templates/languageMultilingualism.tpl | 6 +- .../files/acp/templates/languageServerAdd.tpl | 4 +- .../install/files/acp/templates/login.tpl | 8 +-- .../files/acp/templates/masterPassword.tpl | 6 +- .../acp/templates/masterPasswordInit.tpl | 10 +-- .../install/files/acp/templates/mediaAdd.tpl | 8 +-- .../files/acp/templates/mediaEditor.tpl | 6 +- .../install/files/acp/templates/mediaList.tpl | 10 +-- .../files/acp/templates/mediaListItems.tpl | 2 +- .../install/files/acp/templates/menuAdd.tpl | 12 ++-- .../files/acp/templates/menuItemAdd.tpl | 16 ++--- .../multiSelectSearchableOptionType.tpl | 2 +- .../install/files/acp/templates/noticeAdd.tpl | 18 ++--- .../templates/notificationPresetSettings.tpl | 4 +- .../install/files/acp/templates/option.tpl | 2 +- .../templates/packageInstallationConfirm.tpl | 4 +- .../acp/templates/packageStartInstall.tpl | 12 ++-- .../files/acp/templates/packageUpdate.tpl | 2 +- .../acp/templates/packageUpdateServerAdd.tpl | 10 +-- .../templates/packageUpdateUnauthorized.tpl | 6 +- .../install/files/acp/templates/pageAdd.tpl | 16 ++--- .../files/acp/templates/pageHeaderSearch.tpl | 2 +- .../install/files/acp/templates/pageList.tpl | 8 +-- .../acp/templates/paidSubscriptionAdd.tpl | 20 +++--- .../paidSubscriptionTransactionLogList.tpl | 6 +- .../acp/templates/paidSubscriptionUserAdd.tpl | 6 +- .../paymentMethodSelectOptionType.tpl | 2 +- .../templates/pluginStoreAuthorization.tpl | 4 +- .../acp/templates/radioButtonOptionType.tpl | 2 +- .../radioButtonSearchableOptionType.tpl | 4 +- .../install/files/acp/templates/recaptcha.tpl | 6 +- .../files/acp/templates/rescueMode.tpl | 8 +-- .../templates/selectSearchableOptionType.tpl | 2 +- .../templates/sendMailUserBulkProcessing.tpl | 6 +- .../install/files/acp/templates/smileyAdd.tpl | 16 ++--- .../files/acp/templates/smileyList.tpl | 4 +- wcfsetup/install/files/acp/templates/stat.tpl | 18 ++--- .../install/files/acp/templates/styleAdd.tpl | 50 +++++++------- .../files/acp/templates/styleExport.tpl | 8 +-- .../files/acp/templates/styleImport.tpl | 4 +- .../install/files/acp/templates/styleList.tpl | 2 +- .../acp/templates/styleVariableColor.tpl | 4 +- .../files/acp/templates/styleVariableUnit.tpl | 2 +- .../install/files/acp/templates/tagAdd.tpl | 6 +- .../install/files/acp/templates/tagList.tpl | 8 +-- .../files/acp/templates/tagSetAsSynonyms.tpl | 2 +- .../files/acp/templates/templateAdd.tpl | 6 +- .../files/acp/templates/templateDiff.tpl | 4 +- .../files/acp/templates/templateGroupAdd.tpl | 6 +- .../files/acp/templates/templateList.tpl | 4 +- .../acp/templates/textI18nOptionType.tpl | 2 +- .../files/acp/templates/textOptionType.tpl | 2 +- .../templates/textSearchableOptionType.tpl | 4 +- .../textareaSearchableOptionType.tpl | 2 +- .../acp/templates/userActivityPointOption.tpl | 4 +- .../install/files/acp/templates/userAdd.tpl | 52 +++++++-------- .../files/acp/templates/userAssignToGroup.tpl | 2 +- .../templates/userContentRevertChanges.tpl | 4 +- .../acp/templates/userEmailAddressExport.tpl | 10 +-- .../files/acp/templates/userException.tpl | 2 +- .../files/acp/templates/userGroupAdd.tpl | 12 ++-- .../acp/templates/userGroupAssignmentAdd.tpl | 8 +-- .../files/acp/templates/userGroupOption.tpl | 2 +- .../install/files/acp/templates/userList.tpl | 4 +- .../install/files/acp/templates/userMail.tpl | 12 ++-- .../files/acp/templates/userOptionAdd.tpl | 18 ++--- .../acp/templates/userOptionCategoryAdd.tpl | 6 +- .../acp/templates/userOptionSetDefaults.tpl | 4 +- .../files/acp/templates/userRankAdd.tpl | 14 ++-- .../files/acp/templates/userSearch.tpl | 18 ++--- .../acp/templates/useroptionsOptionType.tpl | 4 +- wcfsetup/install/files/icon/flag/index.php | 10 +-- .../lib/data/media/ViewableMedia.class.php | 2 +- .../files/lib/data/notice/Notice.class.php | 2 +- .../data/user/avatar/DefaultAvatar.class.php | 2 +- .../lib/data/user/avatar/Gravatar.class.php | 2 +- .../lib/data/user/avatar/UserAvatar.class.php | 2 +- .../lib/data/user/rank/UserRank.class.php | 2 +- .../files/lib/system/MetaTagHandler.class.php | 2 +- .../system/bbcode/AttachmentBBCode.class.php | 4 +- .../lib/system/bbcode/ImageBBCode.class.php | 2 +- .../lib/system/bbcode/ListBBCode.class.php | 2 +- .../lib/system/bbcode/MessageParser.class.php | 10 +-- .../bbcode/SimpleMessageParser.class.php | 8 +-- .../lib/system/bbcode/TableBBCode.class.php | 22 +++---- .../highlighter/PhpHighlighter.class.php | 1 - .../cli/command/ImportCLICommand.class.php | 2 +- .../AbstractCheckboxCondition.class.php | 2 +- .../AbstractIntegerCondition.class.php | 4 +- .../condition/AbstractTextCondition.class.php | 2 +- .../AbstractTimestampCondition.class.php | 4 +- .../system/condition/TimeCondition.class.php | 4 +- .../condition/UserBirthdayCondition.class.php | 2 +- .../condition/UserGroupCondition.class.php | 2 +- .../condition/UserLanguageCondition.class.php | 2 +- .../UserMobileBrowserCondition.class.php | 4 +- .../UserRegistrationDateCondition.class.php | 4 +- .../condition/UserStateCondition.class.php | 8 +-- .../page/MultiPageCondition.class.php | 2 +- .../MultipleSelectionFormElement.class.php | 2 +- .../PasswordInputFormElement.class.php | 2 +- .../SingleSelectionFormElement.class.php | 2 +- .../element/TextInputFormElement.class.php | 2 +- .../user/ImageUserOptionOutput.class.php | 2 +- .../SelectOptionsUserOptionOutput.class.php | 2 +- .../method/PaypalPaymentMethod.class.php | 66 +++++++++---------- .../system/session/SessionHandler.class.php | 2 +- .../lib/system/setup/Installer.class.php | 2 +- .../lib/system/style/StyleHandler.class.php | 2 +- ...CheckboxesFunctionTemplatePlugin.class.php | 2 +- wcfsetup/install/lang/de.xml | 38 +++++------ wcfsetup/install/lang/en.xml | 40 +++++------ wcfsetup/setup/lang/setup_de.xml | 8 +-- wcfsetup/setup/lang/setup_en.xml | 8 +-- wcfsetup/setup/template/header.tpl | 6 +- wcfsetup/setup/template/stepConfigureDB.tpl | 24 +++---- .../template/stepConfigureDirectories.tpl | 10 +-- wcfsetup/setup/template/stepCreateUser.tpl | 22 +++---- .../setup/template/stepInstallPackages.tpl | 2 +- wcfsetup/setup/template/stepNext.tpl | 10 +-- .../setup/template/stepSelectLanguages.tpl | 14 ++-- .../template/stepSelectSetupLanguage.tpl | 8 +-- wcfsetup/setup/template/stepShowLicense.tpl | 14 ++-- .../template/stepShowSystemRequirements.tpl | 10 +-- wcfsetup/test.php | 32 ++++----- 223 files changed, 835 insertions(+), 838 deletions(-) diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl index 642c181709..d2c32596d5 100644 --- a/com.woltlab.wcf/templates/__messageFormPoll.tpl +++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl @@ -18,7 +18,7 @@
- + {if $errorField == 'pollQuestion'} {lang}wcf.global.form.error.empty{/lang} @@ -43,7 +43,7 @@
- + {if $errorField == 'pollEndTime'} {lang}wcf.poll.endTime.error.{@$errorType}{/lang} @@ -56,7 +56,7 @@
- + {if $errorField == 'pollMaxVotes'} {lang}wcf.poll.maxVotes.error.{@$errorType}{/lang} @@ -67,19 +67,19 @@
- +
{if !$pollID && $__wcf->getPollManager()->canStartPublicPoll()}
- +
{/if}
- + {lang}wcf.poll.resultsRequireVote.description{/lang}
- +
diff --git a/com.woltlab.wcf/templates/__messageFormSmilies.tpl b/com.woltlab.wcf/templates/__messageFormSmilies.tpl index 1d38ab5842..ef558d47a2 100644 --- a/com.woltlab.wcf/templates/__messageFormSmilies.tpl +++ b/com.woltlab.wcf/templates/__messageFormSmilies.tpl @@ -1,5 +1,5 @@
    {foreach from=$smilies item=smiley} -
  • {$smiley->smileyCode}
    • +
  • {$smiley->smileyCode}
    • {/foreach}
\ No newline at end of file diff --git a/com.woltlab.wcf/templates/accountManagement.tpl b/com.woltlab.wcf/templates/accountManagement.tpl index ae2ebe5bdc..f59e151b55 100644 --- a/com.woltlab.wcf/templates/accountManagement.tpl +++ b/com.woltlab.wcf/templates/accountManagement.tpl @@ -24,7 +24,7 @@
- + {if $errorField == 'password'} {if $errorType == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} @@ -47,7 +47,7 @@
- + {if $errorField == 'username'} @@ -74,7 +74,7 @@
- + {if $errorField == 'newPassword'} @@ -88,7 +88,7 @@
- + {if $errorField == 'confirmNewPassword'} @@ -110,7 +110,7 @@
- + {if $errorField == 'email'} @@ -125,7 +125,7 @@
- + {if $errorField == 'confirmEmail'} @@ -159,14 +159,14 @@
- +
{else}
- + {lang}wcf.user.quit.description{/lang}
@@ -185,7 +185,7 @@
{lang}wcf.user.3rdparty.{@$__authProvider}{/lang}
- +
{elseif !$__wcf->getUser()->hasAdministrativeAccess()} @@ -194,7 +194,7 @@
{lang}wcf.user.3rdparty.github{/lang}
{if $__wcf->getSession()->getVar('__githubToken')} - + {else} {lang}wcf.user.3rdparty.github.connect{/lang} {/if} @@ -207,7 +207,7 @@
{lang}wcf.user.3rdparty.twitter{/lang}
{if $__wcf->getSession()->getVar('__twitterData')} - + {else} {lang}wcf.user.3rdparty.twitter.connect{/lang} {/if} @@ -220,7 +220,7 @@
{lang}wcf.user.3rdparty.facebook{/lang}
{if $__wcf->getSession()->getVar('__facebookData')} - + {else} {lang}wcf.user.3rdparty.facebook.connect{/lang} {/if} @@ -233,7 +233,7 @@
{lang}wcf.user.3rdparty.google{/lang}
{if $__wcf->getSession()->getVar('__googleData')} - + {else} {lang}wcf.user.3rdparty.google.connect{/lang} {/if} @@ -250,7 +250,7 @@ {event name='sections'}
- + {@SECURITY_TOKEN_INPUT_TAG}
diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl index 9657dd227a..fdbb31609f 100644 --- a/com.woltlab.wcf/templates/article.tpl +++ b/com.woltlab.wcf/templates/article.tpl @@ -40,7 +40,7 @@ {if $article->isMultilingual}
  • - + {$articleContent->getLanguage()->languageName}
      @@ -48,7 +48,7 @@ {if $langArticleContent->getLanguage()}
    • - + {$langArticleContent->getLanguage()->languageName}
      • @@ -71,7 +71,7 @@ {if $article->isMultilingual} {foreach from=$article->getLanguageLinks() item='langArticleContent'} {if $langArticleContent->getLanguage()} - + {/if} {/foreach} {/if} diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl index dcf7f71998..8f0a4a3ad9 100644 --- a/com.woltlab.wcf/templates/articleList.tpl +++ b/com.woltlab.wcf/templates/articleList.tpl @@ -1,15 +1,15 @@ {capture assign='headContent'} {if $pageNo < $pages} - + {/if} {if $pageNo > 1} - + {/if} {if $__wcf->getUser()->userID} - + {else} - + {/if} {/capture} diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl index 9d585fd554..6233772cf4 100644 --- a/com.woltlab.wcf/templates/attachments.tpl +++ b/com.woltlab.wcf/templates/attachments.tpl @@ -15,9 +15,9 @@
      {if $attachment->hasThumbnail()} - thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}> + thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}/> {else} - width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}> + width >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->height >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}/> {/if} diff --git a/com.woltlab.wcf/templates/avatarEdit.tpl b/com.woltlab.wcf/templates/avatarEdit.tpl index faaff97de9..eba0a80bdb 100644 --- a/com.woltlab.wcf/templates/avatarEdit.tpl +++ b/com.woltlab.wcf/templates/avatarEdit.tpl @@ -17,7 +17,7 @@
      - + {lang}wcf.user.avatar.type.none.description{/lang}
      @@ -32,11 +32,11 @@ {@$__wcf->getUserProfileHandler()->getAvatar()->getImageTag(96)} {/if} {else} - + {/if}
      - + {lang}wcf.user.avatar.type.custom.description{/lang} {* placeholder for upload button: *} @@ -53,9 +53,9 @@ {if MODULE_GRAVATAR}
      -
      +
      - + {if $errorField == 'gravatar'} {if $errorType == 'notFound'}{lang}wcf.user.avatar.type.gravatar.error.notFound{/lang}{/if} @@ -73,7 +73,7 @@ {if !$__wcf->user->disableAvatar}
      - + {@SECURITY_TOKEN_INPUT_TAG}
      {/if} diff --git a/com.woltlab.wcf/templates/benchmark.tpl b/com.woltlab.wcf/templates/benchmark.tpl index b5bb5ddf3b..d790c9d7ba 100644 --- a/com.woltlab.wcf/templates/benchmark.tpl +++ b/com.woltlab.wcf/templates/benchmark.tpl @@ -14,7 +14,7 @@
      @@ -56,7 +56,7 @@
      - +
      @@ -71,7 +71,7 @@
      - + {if $errorType.email|isset} {if $errorType.email == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} @@ -87,7 +87,7 @@
      - + {if $errorType.confirmEmail|isset} {if $errorType.confirmEmail == 'notEqual'}{lang}wcf.user.confirmEmail.error.notEqual{/lang}{/if} @@ -108,7 +108,7 @@
      - + {if $errorType.password|isset} {if $errorType.password == 'empty'}{lang}wcf.global.form.error.empty{/lang}{/if} @@ -124,7 +124,7 @@
      - + {if $errorType.confirmPassword|isset} {if $errorType.confirmPassword == 'notEqual'}{lang}wcf.user.confirmPassword.error.notEqual{/lang}{/if} @@ -159,7 +159,7 @@
      {content} {foreach from=$availableContentLanguages item=language} - + {/foreach} {/content} {lang}wcf.user.visibleLanguages.description{/lang}
      @@ -183,7 +183,7 @@ {include file='captcha'}
      - + {@SECURITY_TOKEN_INPUT_TAG}
      diff --git a/com.woltlab.wcf/templates/registerActivation.tpl b/com.woltlab.wcf/templates/registerActivation.tpl index 6d477448db..4f268c51f8 100644 --- a/com.woltlab.wcf/templates/registerActivation.tpl +++ b/com.woltlab.wcf/templates/registerActivation.tpl @@ -9,7 +9,7 @@
      - + {if $errorField == 'username'} {if $errorType == 'notFound'}{lang}wcf.user.username.error.notFound{/lang}{/if} @@ -21,7 +21,7 @@
      - + {if $errorField == 'activationCode'} {if $errorType == 'notValid'}{lang}wcf.user.activationCode.error.notValid{/lang}{/if} @@ -37,7 +37,7 @@ {event name='sections'}
      - + {@SECURITY_TOKEN_INPUT_TAG}
      diff --git a/com.woltlab.wcf/templates/registerNewActivationCode.tpl b/com.woltlab.wcf/templates/registerNewActivationCode.tpl index bf936901c6..ee0e239f1c 100644 --- a/com.woltlab.wcf/templates/registerNewActivationCode.tpl +++ b/com.woltlab.wcf/templates/registerNewActivationCode.tpl @@ -7,7 +7,7 @@
      - + {if $errorField == 'username'} {if $errorType == 'empty'} @@ -25,7 +25,7 @@
      - + {if $errorField == 'password'} {if $errorType == 'empty'} @@ -41,7 +41,7 @@
      - + {if $errorField == 'email'} {lang}wcf.user.email.error.{@$errorType}{/lang} @@ -57,7 +57,7 @@ {event name='sections'}
      - + {@SECURITY_TOKEN_INPUT_TAG}
      diff --git a/com.woltlab.wcf/templates/search.tpl b/com.woltlab.wcf/templates/search.tpl index 01c1e8ede8..2a28ff89f0 100644 --- a/com.woltlab.wcf/templates/search.tpl +++ b/com.woltlab.wcf/templates/search.tpl @@ -11,7 +11,7 @@
      - + {if $errorField == 'q'} {if $errorType == 'empty'} @@ -21,7 +21,7 @@ {/if} {/if} - + {event name='queryOptions'} {lang}wcf.search.query.description{/lang} @@ -31,8 +31,8 @@
      - - + + {event name='authorOptions'}
      @@ -40,8 +40,8 @@
      - - + + {event name='periodOptions'}
      @@ -75,7 +75,7 @@
      {foreach from=$objectTypes key=objectTypeName item=objectType} {if $objectType->isAccessible()} - + {/if} {/foreach}
      @@ -110,7 +110,7 @@ {/foreach}
      - + {@SECURITY_TOKEN_INPUT_TAG}
      diff --git a/com.woltlab.wcf/templates/searchArticle.tpl b/com.woltlab.wcf/templates/searchArticle.tpl index bf559210b1..59557743c7 100644 --- a/com.woltlab.wcf/templates/searchArticle.tpl +++ b/com.woltlab.wcf/templates/searchArticle.tpl @@ -4,7 +4,7 @@
        {foreach from=$articleCategoryList item=category} getDepth() > 1} style="padding-left: {$category->getDepth()*20-20}px"{/if}> - + {/foreach}
      diff --git a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl index 07a0a5560f..ce95ace340 100644 --- a/com.woltlab.wcf/templates/selectSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/selectSearchableOptionType.tpl @@ -1,4 +1,4 @@ - + + {/foreach} {/content} {lang}wcf.user.visibleLanguages.description{/lang}
    • @@ -99,8 +99,8 @@ {event name='sections'}
    - - {if $category != 'general'}{/if} + + {if $category != 'general'}{/if} {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl index b14fc22b11..e1d7d0a824 100644 --- a/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl +++ b/com.woltlab.wcf/templates/shareButtonsPrivacySettings.tpl @@ -1,12 +1,12 @@ {lang}wcf.message.share.privacy.description{/lang}
      -
      • -
      • -
      • -
      • +
      • +
      • +
      • +
    - +
    diff --git a/com.woltlab.wcf/templates/signatureEdit.tpl b/com.woltlab.wcf/templates/signatureEdit.tpl index 1ab271a330..032bb9a64d 100644 --- a/com.woltlab.wcf/templates/signatureEdit.tpl +++ b/com.woltlab.wcf/templates/signatureEdit.tpl @@ -57,7 +57,7 @@ {if !$__wcf->user->disableSignature}
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/com.woltlab.wcf/templates/styleChooser.tpl b/com.woltlab.wcf/templates/styleChooser.tpl index 1d415b3ee8..f5876d9739 100644 --- a/com.woltlab.wcf/templates/styleChooser.tpl +++ b/com.woltlab.wcf/templates/styleChooser.tpl @@ -3,7 +3,7 @@
  • - +
    diff --git a/com.woltlab.wcf/templates/tagInput.tpl b/com.woltlab.wcf/templates/tagInput.tpl index 23daa44c04..5efb00b858 100644 --- a/com.woltlab.wcf/templates/tagInput.tpl +++ b/com.woltlab.wcf/templates/tagInput.tpl @@ -2,7 +2,7 @@
    - + {lang}wcf.tagging.tags.description{/lang}
    diff --git a/com.woltlab.wcf/templates/tagged.tpl b/com.woltlab.wcf/templates/tagged.tpl index 4a8b72f9c8..adfff67bce 100644 --- a/com.woltlab.wcf/templates/tagged.tpl +++ b/com.woltlab.wcf/templates/tagged.tpl @@ -4,12 +4,12 @@ {capture assign='headContent'} {if $pageNo < $pages} - + {/if} {if $pageNo > 1} - + {/if} - + {/capture} {capture assign='sidebarLeft'} diff --git a/com.woltlab.wcf/templates/team.tpl b/com.woltlab.wcf/templates/team.tpl index 3ebeb973df..c90e74caa2 100644 --- a/com.woltlab.wcf/templates/team.tpl +++ b/com.woltlab.wcf/templates/team.tpl @@ -1,5 +1,5 @@ {capture assign='headContent'} - + {/capture} {include file='header'} diff --git a/com.woltlab.wcf/templates/textI18nOptionType.tpl b/com.woltlab.wcf/templates/textI18nOptionType.tpl index 95606c98c9..750ad80a83 100644 --- a/com.woltlab.wcf/templates/textI18nOptionType.tpl +++ b/com.woltlab.wcf/templates/textI18nOptionType.tpl @@ -1,2 +1,2 @@ - + {include file='multipleLanguageInputJavascript' elementIdentifier=$option->optionName forceSelection=false} \ No newline at end of file diff --git a/com.woltlab.wcf/templates/textOptionType.tpl b/com.woltlab.wcf/templates/textOptionType.tpl index a7b643097b..3477f93a84 100644 --- a/com.woltlab.wcf/templates/textOptionType.tpl +++ b/com.woltlab.wcf/templates/textOptionType.tpl @@ -1 +1 @@ -minlength > 0} required="required"{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if}> +minlength > 0} required="required"{/if}{if $option->maxlength} maxlength="{$option->maxlength}"{/if}{if $inputClass} class="{@$inputClass}"{/if} /> diff --git a/com.woltlab.wcf/templates/textSearchableOptionType.tpl b/com.woltlab.wcf/templates/textSearchableOptionType.tpl index b16f8c98d4..945e8366e7 100644 --- a/com.woltlab.wcf/templates/textSearchableOptionType.tpl +++ b/com.woltlab.wcf/templates/textSearchableOptionType.tpl @@ -1,5 +1,5 @@ - - + + diff --git a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl index aa3c5280ea..261f57b952 100644 --- a/com.woltlab.wcf/templates/userProfileAboutEditable.tpl +++ b/com.woltlab.wcf/templates/userProfileAboutEditable.tpl @@ -7,7 +7,7 @@
    - + {if $errorType[__userTitle]|isset} {lang}wcf.user.userTitle.error.{@$errorType[__userTitle]}{/lang} diff --git a/com.woltlab.wcf/templates/userSearch.tpl b/com.woltlab.wcf/templates/userSearch.tpl index bf8207ffde..aa98a61098 100644 --- a/com.woltlab.wcf/templates/userSearch.tpl +++ b/com.woltlab.wcf/templates/userSearch.tpl @@ -11,7 +11,7 @@
    - +
    @@ -33,7 +33,7 @@ {event name='sections'}
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/com.woltlab.wcf/templates/usersOnlineList.tpl b/com.woltlab.wcf/templates/usersOnlineList.tpl index 0cc97028ba..7433466544 100644 --- a/com.woltlab.wcf/templates/usersOnlineList.tpl +++ b/com.woltlab.wcf/templates/usersOnlineList.tpl @@ -1,10 +1,10 @@ {capture assign='pageTitle'}{$__wcf->getActivePage()->getTitle()}{if $pageNo > 1} - {lang}wcf.page.pageNo{/lang}{/if}{/capture} {capture assign='headContent'} - + {if USERS_ONLINE_PAGE_REFRESH > 0} - + {/if} {/capture} @@ -35,7 +35,7 @@
    - + {@SID_INPUT_TAG}
    @@ -141,7 +141,7 @@ {capture append=robotsOnlineList}
  • -
    +
    @@ -161,7 +161,7 @@ {capture append=guestsOnlineList}
  • -
    +
    diff --git a/wcfsetup/install.php b/wcfsetup/install.php index 47867e6854..f36ad6a225 100644 --- a/wcfsetup/install.php +++ b/wcfsetup/install.php @@ -133,15 +133,15 @@ class SystemException extends \Exception implements IPrintableException {

    Information:

    - error message: getMessage()); ?>
    - error code: getCode()); ?>
    + error message: getMessage()); ?>
    + error code: getCode()); ?>
    information; ?> - file: getFile()); ?> (getLine(); ?>)
    - php version:
    - wcf version:
    - date:
    - request:
    - referer:
    + file: getFile()); ?> (getLine(); ?>)
    + php version:
    + wcf version:
    + date:
    + request:
    + referer:

    Stacktrace:

    diff --git a/wcfsetup/install/files/acp/dereferrer.php b/wcfsetup/install/files/acp/dereferrer.php index 9094a3942e..025038b8e2 100644 --- a/wcfsetup/install/files/acp/dereferrer.php +++ b/wcfsetup/install/files/acp/dereferrer.php @@ -21,7 +21,7 @@ if (strpos($testURL, 'script:') !== false || !preg_match('~^https?://~', $testUR Dereferer - +

    diff --git a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl index 11758b2fa1..4db8cbed80 100644 --- a/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl +++ b/wcfsetup/install/files/acp/templates/acpSessionLogList.tpl @@ -42,7 +42,7 @@ {@$sessionLog->sessionLogID} {$sessionLog->username} - {$sessionLog->getIpAddress()}{if $sessionLog->hostname != $sessionLog->ipAddress}
    {$sessionLog->hostname}{/if} + {$sessionLog->getIpAddress()}{if $sessionLog->hostname != $sessionLog->ipAddress}
    {$sessionLog->hostname}{/if} {$sessionLog->userAgent|truncate:75|tableWordwrap} {@$sessionLog->time|time} {@$sessionLog->lastActivityTime|time} diff --git a/wcfsetup/install/files/acp/templates/adAdd.tpl b/wcfsetup/install/files/acp/templates/adAdd.tpl index ffba830938..dfe55c0d47 100644 --- a/wcfsetup/install/files/acp/templates/adAdd.tpl +++ b/wcfsetup/install/files/acp/templates/adAdd.tpl @@ -35,7 +35,7 @@
    - + {if $errorField == 'adName'} {if $errorType == 'empty'} @@ -68,7 +68,7 @@
    - +
    @@ -102,7 +102,7 @@
    - + {lang}wcf.acp.ad.showOrder.description{/lang}
    @@ -153,7 +153,7 @@
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/wcfsetup/install/files/acp/templates/applicationEdit.tpl b/wcfsetup/install/files/acp/templates/applicationEdit.tpl index 1383e92bd6..5f56f6a64f 100644 --- a/wcfsetup/install/files/acp/templates/applicationEdit.tpl +++ b/wcfsetup/install/files/acp/templates/applicationEdit.tpl @@ -27,7 +27,7 @@
    - + {if $errorField == 'domainName'} {if $errorType == 'empty'} @@ -44,7 +44,7 @@
    - + {lang}wcf.acp.application.domainPath.description{/lang} {if $errorField == 'domainPath'} @@ -70,7 +70,7 @@
    - + {if $errorField == 'cookieDomain'} {if $errorType == 'empty'} @@ -89,7 +89,7 @@ {event name='sections'}
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/wcfsetup/install/files/acp/templates/articleAdd.tpl b/wcfsetup/install/files/acp/templates/articleAdd.tpl index 3118afc53c..6ceb45fb24 100644 --- a/wcfsetup/install/files/acp/templates/articleAdd.tpl +++ b/wcfsetup/install/files/acp/templates/articleAdd.tpl @@ -87,7 +87,7 @@
    - + {if $errorField == 'username'} {if $errorType == 'empty'} @@ -103,7 +103,7 @@
    - + {if $errorField == 'time'} {if $errorType == 'empty'} @@ -119,16 +119,16 @@
    - - - + + +
    @@ -161,7 +161,7 @@ {/if}

    {lang}wcf.acp.article.image.button.chooseImage{/lang}

    - + {if $errorField == 'image'} {lang}wcf.acp.article.image.error.{@$errorType}{/lang} {/if} @@ -179,7 +179,7 @@
    - + {if $errorField == 'title'} {if $errorType == 'empty'} @@ -196,7 +196,7 @@
    - + {lang}wcf.tagging.tags.description{/lang}
    @@ -275,7 +275,7 @@ {/if}

    {lang}wcf.acp.article.image.button.chooseImage{/lang}

    - languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if}> + languageID]|isset} value="{@$imageID[$availableLanguage->languageID]}"{/if} /> {if $errorField == 'image'|concat:$availableLanguage->languageID} {lang}wcf.acp.article.image.error.{@$errorType}{/lang} {/if} @@ -293,7 +293,7 @@ languageID} class="formError"{/if}>
    - + {if $errorField == 'title'|concat:$availableLanguage->languageID} {if $errorType == 'empty'} @@ -310,7 +310,7 @@
    - + {lang}wcf.tagging.tags.description{/lang}
    diff --git a/wcfsetup/install/files/acp/templates/articleList.tpl b/wcfsetup/install/files/acp/templates/articleList.tpl index 152817bfc8..9daf33c477 100644 --- a/wcfsetup/install/files/acp/templates/articleList.tpl +++ b/wcfsetup/install/files/acp/templates/articleList.tpl @@ -50,21 +50,21 @@
    - +
    - +
    - +
    @@ -72,7 +72,7 @@
    - + {@SECURITY_TOKEN_INPUT_TAG}
    @@ -129,7 +129,7 @@ {if $article->getImage()} {@$article->getImage()->getElementTag(48)} {else} - + {/if} diff --git a/wcfsetup/install/files/acp/templates/attachmentList.tpl b/wcfsetup/install/files/acp/templates/attachmentList.tpl index 471c89c963..0e03c09125 100644 --- a/wcfsetup/install/files/acp/templates/attachmentList.tpl +++ b/wcfsetup/install/files/acp/templates/attachmentList.tpl @@ -36,14 +36,14 @@
    - +
    - +
    @@ -63,7 +63,7 @@
    - + {@SECURITY_TOKEN_INPUT_TAG}
    @@ -111,7 +111,7 @@
    isImage} class="jsImageViewer" title="{$attachment->filename}"{/if}> {if $attachment->tinyThumbnailType} - + {else} {/if} diff --git a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl index 42a30590a5..73c9395640 100644 --- a/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl +++ b/wcfsetup/install/files/acp/templates/bbCodeSelectOptionType.tpl @@ -1,3 +1,3 @@ {foreach from=$bbCodes item='bbCode'} - + {/foreach} \ No newline at end of file diff --git a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl index 3458bf2159..661e19c1e3 100644 --- a/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl +++ b/wcfsetup/install/files/acp/templates/bbcodeAdd.tpl @@ -7,28 +7,28 @@
    - +
    - +
    - +
    - + {lang}wcf.acp.bbcode.attribute.useText.description{/lang}
    @@ -101,7 +101,7 @@
    - + {if $errorField == 'bbcodeTag'} {if $errorType == 'empty'} @@ -117,7 +117,7 @@
    - + {if $errorField == 'htmlOpen'} {lang}wcf.acp.bbcode.htmlOpen.error.{$errorType}{/lang} {/if} @@ -127,7 +127,7 @@
    - + {if $errorField == 'htmlClose'} {lang}wcf.acp.bbcode.htmlClose.error.{$errorType}{/lang} {/if} @@ -145,7 +145,7 @@
    - + {lang}wcf.acp.bbcode.isSourceCode.description{/lang}
    @@ -153,7 +153,7 @@
    - + {if $errorField == 'className'} {lang}wcf.acp.bbcode.className.error.{$errorType}{/lang} {/if} @@ -164,14 +164,14 @@
    - +
    - + {if $errorField == 'buttonLabel'} {if $errorType == 'empty'} @@ -191,7 +191,7 @@
    - + {if $errorField == 'wysiwygIcon'} {if $errorType == 'empty'} @@ -219,14 +219,14 @@ attributeNo} class="formError"{/if}>
    - +
    attributeNo} class="formError"{/if}>
    - + {if $errorField == 'attributeValidationPattern'|concat:$attribute->attributeNo} {if $errorType == 'notValid'} @@ -239,13 +239,13 @@ attributeNo} class="formError"{/if}>
    - +
    attributeNo} class="formError"{/if}>
    - + {lang}wcf.acp.bbcode.attribute.useText.description{/lang}
    @@ -258,7 +258,7 @@ {event name='sections'}
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl index 05fdde8b2a..3bf309f34f 100644 --- a/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl +++ b/wcfsetup/install/files/acp/templates/bbcodeMediaProviderAdd.tpl @@ -25,7 +25,7 @@
    - + {if $errorField == 'title'} {if $errorType == 'empty'} @@ -78,7 +78,7 @@ {event name='sections'}
    - + {@SECURITY_TOKEN_INPUT_TAG}
    diff --git a/wcfsetup/install/files/acp/templates/benchmark.tpl b/wcfsetup/install/files/acp/templates/benchmark.tpl index b5bb5ddf3b..d790c9d7ba 100644 --- a/wcfsetup/install/files/acp/templates/benchmark.tpl +++ b/wcfsetup/install/files/acp/templates/benchmark.tpl @@ -14,7 +14,7 @@