Remove trailing whitespace

diff --git a/com.woltlab.wcf/templates/attachments.tpl b/com.woltlab.wcf/templates/attachments.tpl
index 9d585fd55474b1dad339d18cddd20ca6bd02ff4e..c378ff92199b3b3e290647849fee898170ccdbb2 100644 (file)
--- a/com.woltlab.wcf/templates/attachments.tpl
+++ b/com.woltlab.wcf/templates/attachments.tpl
@@ -12,7 +12,7 @@
                                                                        <a href="{link controller='Attachment' object=$attachment}{/link}"{if $attachment->canDownload()} class="jsImageViewer" title="{$attachment->filename}"{/if}>
                                                                {/if}
                                                                
-                                                               <div class="attachmentThumbnailContainer">              
+                                                               <div class="attachmentThumbnailContainer">
                                                                        <span class="attachmentThumbnailImage">
                                                                                {if $attachment->hasThumbnail()}
                                                                                        <img src="{link controller='Attachment' object=$attachment}thumbnail=1{/link}" alt="" {if $attachment->thumbnailWidth >= ATTACHMENT_THUMBNAIL_WIDTH && $attachment->thumbnailHeight >= ATTACHMENT_THUMBNAIL_HEIGHT} class="attachmentThumbnailImageScalable"{/if}>
@@ -25,7 +25,7 @@
                                                                                <span class="attachmentFilename">{$attachment->filename}</span>
                                                                        </span>
                                                                </div>
-                                                                               
+                                                               
                                                                <ul class="attachmentMetaData inlineList">
                                                                        <li>
                                                                                <span class="icon icon16 fa-file-text-o"></span>
@@ -39,8 +39,8 @@
                                                                                <span class="icon icon16 fa-eye"></span>
                                                                                {#$attachment->downloads}
                                                                        </li>
-                                                               </ul>           
-                                                                               
+                                                               </ul>
+                                                               
                                                                {if $attachment->hasThumbnail()}
                                                                        </a>
                                                                {/if}

diff --git a/com.woltlab.wcf/templates/boxWhoWasOnline.tpl b/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
index 0f7e59aa7b3b213c5a741dd391adea0e974fa21e..f3424ad78c4d7b525064c39e8c4965c5b5808326 100644 (file)
--- a/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
+++ b/com.woltlab.wcf/templates/boxWhoWasOnline.tpl
@@ -3,7 +3,7 @@
                {foreach from=$whoWasOnlineList item=userOnline}
                        <li><a href="{link controller='User' object=$userOnline}{/link}" title="{$userOnline->username} ({@$userOnline->lastActivityTime|date:$whoWasOnlineTimeFormat})" class="jsTooltip">{@$userOnline->getAvatar()->getImageTag(48)}</a></li>
                {/foreach}
-       </ul>   
+       </ul>
 {else}
        <ul class="inlineList commaSeparated">
                {foreach from=$whoWasOnlineList item=userOnline}

diff --git a/com.woltlab.wcf/templates/footer.tpl b/com.woltlab.wcf/templates/footer.tpl
index e9f3055ea12a20fedcd1ff23a37b0c4055c2f1a5..94c841b0deddd488f3925474ff08616d133580c8 100644 (file)
--- a/com.woltlab.wcf/templates/footer.tpl
+++ b/com.woltlab.wcf/templates/footer.tpl
@@ -8,7 +8,7 @@
                                                                        {@$box->render()}
                                                                {/foreach}
                                                        {/content}
-                                               </div>  
+                                               </div>
                                        </div>
                                {/hascontent}
                                
@@ -16,7 +16,7 @@
                                        {@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.footer.content')}
                                {/if}
                        </div>
-                               
+                       
                        {hascontent}
                                <aside class="sidebar boxesSidebarRight">
                                        <div class="boxContainer">
@@ -40,12 +40,12 @@
                                                
                                                        {event name='boxesSidebarRightBottom'}
                                                {/content}
-                                       </div>  
+                                       </div>
                                </aside>
                        {/hascontent}
                </div>
        </section>
-                               
+       
        {hascontent}
                <div class="boxesBottom">
                        <div class="boxContainer">
@@ -58,12 +58,12 @@
                                                {@$box->render()}
                                        {/foreach}
                                {/content}
-                       </div>  
+                       </div>
                </div>
        {/hascontent}
-               
+       
        {hascontent}
-               <div class="boxesFooterBoxes">                  
+               <div class="boxesFooterBoxes">
                        <div class="layoutBoundary">
                                <div class="boxContainer">
                                        {content}
@@ -73,16 +73,16 @@
                                                        {@$box->render()}
                                                {/foreach}
                                        {/content}
-                               </div>  
+                               </div>
                        </div>
                </div>
        {/hascontent}
        
        {include file='pageFooter'}
 </div>
-                               
+
 {include file='pageMenuMobile'}
-                               
+
 {event name='footer'}
 
 <div class="pageFooterStickyNotice">
@@ -110,6 +110,6 @@
 {@FOOTER_CODE}
 
 <a id="bottom"></a>
-                               
+
 </body>
 </html>

diff --git a/com.woltlab.wcf/templates/header.tpl b/com.woltlab.wcf/templates/header.tpl
index d9162ff3f9e914bea2da8e251e874ca946eb6974..37326249348a3b4aefa59eeae0fefa850f375fc7 100644 (file)
--- a/com.woltlab.wcf/templates/header.tpl
+++ b/com.woltlab.wcf/templates/header.tpl
@@ -41,7 +41,7 @@
                                                        {@$box->render()}
                                                {/foreach}
                                        {/content}
-                               </div>  
+                               </div>
                        </div>
                </div>
        {/hascontent}
@@ -60,7 +60,7 @@
                                                {@$box->render()}
                                        {/foreach}
                                {/content}
-                       </div>  
+                       </div>
                </div>
        {/hascontent}
        
@@ -93,7 +93,7 @@
                                                        
                                                        {if MODULE_WCF_AD && $__disableAds|empty}{@$__wcf->getAdHandler()->getAds('com.woltlab.wcf.sidebar.bottom')}{/if}
                                                {/content}
-                                       </div>  
+                                       </div>
                                </aside>
                        {/hascontent}
                        

diff --git a/com.woltlab.wcf/templates/membersList.tpl b/com.woltlab.wcf/templates/membersList.tpl
index 46397ae40d20fff5e5d8c2f4b1b513b223b7baa8..f746f9ac803d6f30257022fddb1c7c713b46b7fd 100644 (file)
--- a/com.woltlab.wcf/templates/membersList.tpl
+++ b/com.woltlab.wcf/templates/membersList.tpl
@@ -42,9 +42,9 @@
                                {/foreach}
                                {if !$letter|empty}<li class="lettersReset"><a href="{if $searchID}{link controller='MembersList' id=$searchID}sortField={$sortField}&sortOrder={$sortOrder}{/link}{else}{link controller='MembersList'}sortField={$sortField}&sortOrder={$sortOrder}{/link}{/if}" class="button small">{lang}wcf.user.members.sort.letters.all{/lang}</a></li>{/if}
                        </ul>
-               </div>  
+               </div>
        </section>
-
+       
        <section class="box">
                <form method="post" action="{if $searchID}{link controller='MembersList' id=$searchID}{/link}{else}{link controller='MembersList'}{/link}{/if}">
                        <h2 class="boxTitle">{lang}wcf.user.members.sort{/lang}</h2>

diff --git a/com.woltlab.wcf/templates/pageHeader.tpl b/com.woltlab.wcf/templates/pageHeader.tpl
index b6be88d0349af282ec87e3972bda37aefdf1ccd9..1516b16d91029b0d8666ce0c2c829db287dcd108 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeader.tpl
+++ b/com.woltlab.wcf/templates/pageHeader.tpl
@@ -33,7 +33,7 @@
                                                        {@$box->render()}
                                                {/foreach}
                                        {/content}
-                               </div>  
+                               </div>
                        </div>
                </div>
        {/hascontent}

diff --git a/com.woltlab.wcf/templates/pageMenuMobile.tpl b/com.woltlab.wcf/templates/pageMenuMobile.tpl
index 574be0714ee25f3a259841873182e26020865ebb..c52b022b7f6e398129bc2136bf6b23acf004dbd3 100644 (file)
--- a/com.woltlab.wcf/templates/pageMenuMobile.tpl
+++ b/com.woltlab.wcf/templates/pageMenuMobile.tpl
@@ -24,7 +24,7 @@
                                <span class="icon icon24 fa-search"></span>
                                <span class="menuOverlayItemTitle">{lang}wcf.global.search{/lang}</span>
                        </a>
-               </li>                   
+               </li>
                <li class="menuOverlayItem" id="pageMainMenuMobilePageOptionsContainer">
                        <a href="#" class="menuOverlayItemLink box24">
                                <span class="icon icon24 fa-gears"></span>
@@ -44,7 +44,7 @@
                                {foreach from=$__wcf->getBreadcrumbs() item=$breadcrumb}
                                        <li class="menuOverlayItem">
                                                <a href="{$breadcrumb->getURL()}" class="menuOverlayItemLink">
-                                                       <span{if $__breadcrumbsDepth} style="padding-left: {$__breadcrumbsDepth * 20}px" {/if} class="box24"> 
+                                                       <span{if $__breadcrumbsDepth} style="padding-left: {$__breadcrumbsDepth * 20}px" {/if} class="box24">
                                                                <span class="icon icon24 fa-{if $__breadcrumbsDepth}caret-right{else}home{/if}"></span>
                                                                <span class="menuOverlayItemTitle">{$breadcrumb->getLabel()}</span>
                                                        </span>

diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index ab4cf3af7b798136a813e6ef6de4c71229d71e7f..ab9919d72577e346df805c86aad6a9e2c1e1c5d1 100644 (file)
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -8,7 +8,7 @@
                                        <h3>
                                                <a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
                                                <small class="separatorLeft">{@$event->time|time}</small>
-                                       </h3> 
+                                       </h3>
                                        <div>{@$event->getTitle()}</div>
                                        <small class="containerContentType">{lang}wcf.user.recentActivity.{@$event->getObjectTypeName()}{/lang}</small>
                                </div>

diff --git a/com.woltlab.wcf/templates/register.tpl b/com.woltlab.wcf/templates/register.tpl
index 9764d90e8f2ad531dfc389c2d88310b2210f1d7e..3985962bc5284abd69005e8dff3e75cf58c7652c 100644 (file)
--- a/com.woltlab.wcf/templates/register.tpl
+++ b/com.woltlab.wcf/templates/register.tpl
@@ -1,5 +1,5 @@
 {capture assign='headContent'}
-       <style type="text/css"> 
+       <style type="text/css">
                #fieldset1 {
                        display: none;
                }

diff --git a/com.woltlab.wcf/templates/userBirthdayList.tpl b/com.woltlab.wcf/templates/userBirthdayList.tpl
index 132bf2012bbefa02b9e60b20c5837eb37fe6eeb9..6a9f1b9fea652151d62e151c1f45dc522b4a7d54 100644 (file)
--- a/com.woltlab.wcf/templates/userBirthdayList.tpl
+++ b/com.woltlab.wcf/templates/userBirthdayList.tpl
@@ -25,7 +25,7 @@
                                                        
                                                        <dl class="plain inlineDataList">
                                                                {include file='userInformationStatistics'}
-                                                       </dl>   
+                                                       </dl>
                                                </div>
                                        </div>
                                </li>

diff --git a/com.woltlab.wcf/templates/userInformationHeadline.tpl b/com.woltlab.wcf/templates/userInformationHeadline.tpl
index 39ea0e24a9df7ece088918415dc90614b08ba493..a2bfcae90bdf4666aac2bf8640c018064ce338b7 100644 (file)
--- a/com.woltlab.wcf/templates/userInformationHeadline.tpl
+++ b/com.woltlab.wcf/templates/userInformationHeadline.tpl
@@ -9,7 +9,7 @@
                        {/if}
                {/if}
        </h3>
-</div> 
+</div>
 <ul class="inlineList commaSeparated">
        {if $__wcf->getSession()->getPermission('user.profile.canViewUserProfile') && $user->isAccessible('canViewProfile')}
                {if $user->isVisibleOption('gender') && $user->gender}<li>{lang}wcf.user.gender.{if $user->gender == 1}male{else}female{/if}{/lang}</li>{/if}

diff --git a/com.woltlab.wcf/templates/userProfileAbout.tpl b/com.woltlab.wcf/templates/userProfileAbout.tpl
index b63e1ca9de31f73a2516093ce9540507cb21a514..d652a2baba3f7d23b92dc47464c234d8415cf153 100644 (file)
--- a/com.woltlab.wcf/templates/userProfileAbout.tpl
+++ b/com.woltlab.wcf/templates/userProfileAbout.tpl
@@ -18,5 +18,5 @@
 {hascontentelse}
        <div class="section">
                <p class="info">{lang}wcf.user.profile.content.about.noPublicData{/lang}</p>
-       </div>  
+       </div>
 {/hascontent}

diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index 10f83dd4ef93f0fcc00669a1837a93fed5dfd86d..873fe1c966e8a5764ccd348f5a9a863481310ec5 100644 (file)
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -8,7 +8,7 @@
                                        <h3>
                                                <a href="{link controller='User' object=$like->getUserProfile()}{/link}" class="userLink" data-user-id="{@$like->getUserProfile()->userID}">{$like->getUserProfile()->username}</a>
                                                <small class="separatorLeft">{@$like->time|time}</small>
-                                       </h3> 
+                                       </h3>
                                        <div>{@$like->getTitle()}</div>
                                        <small class="containerContentType">{lang}wcf.like.objectType.{@$like->getObjectTypeName()}{/lang}</small>
                                </div>

diff --git a/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl b/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
index 0fabd6ac9f8a59af5aecef639ad7426c95769173..53251812ade7b83a7293d78e1f8cff5e79c089d9 100644 (file)
--- a/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
+++ b/com.woltlab.wcf/templates/usersOnlineInfoBox.tpl
@@ -7,7 +7,7 @@
                        <ul class="inlineList dotSeparated">
                                <li>{lang}wcf.user.usersOnline.detail{/lang}</li>
                                {if $usersOnlineShowRecord && USERS_ONLINE_RECORD}<li>{lang}wcf.user.usersOnline.record{/lang}</li>{/if}
-                       </ul>   
+                       </ul>
                        
                        {if $usersOnlineList|count}
                                <ul class="inlineList commaSeparated">

diff --git a/defaultStyle/style.xml b/defaultStyle/style.xml
index 128b94a4a45e9cfbc4f25b14a970ba1c7c5091f1..a4fba4794f460f15d08ac64134a157538be920b8 100644 (file)
--- a/defaultStyle/style.xml
+++ b/defaultStyle/style.xml
@@ -6,7 +6,7 @@
                <copyright>WoltLab GmbH</copyright>
                <license>GNU Lesser General Public License</license>
                <version>3.0.0 Alpha 1</version>
-               <image>stylePreview-defaultStyle.png</image> 
+               <image>stylePreview-defaultStyle.png</image>
        </general>
        
        <author>

diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 4a652e0691971458c2b9a46dafe7a95fd2079d0f..e2ed11446f2ff854af7e207d7e3784c30722a735 100644 (file)
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -56,7 +56,7 @@
                                                </select>
                                        </dd>
                                </dl>
-                       </div>  
+                       </div>
                </section>
                
                <div class="formSubmit">

diff --git a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
index 0c1036d1e30e51d537a4993c6b9d8741ebebe428..df207db9a3073a78ad479649c536cf5941d174d9 100644 (file)
--- a/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
+++ b/wcfsetup/install/files/acp/templates/notificationPresetSettings.tpl
@@ -40,7 +40,7 @@
                                <dt></dt>
                                <dd>
                                        <label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked{/if}> {lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers{/lang}</label>
-                                       <small>{lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers.description{/lang}</small>     
+                                       <small>{lang}wcf.acp.user.notificationPresetSettings.applyChangesToExistingUsers.description{/lang}</small>
                                </dd>
                        </dl>
                </div>

diff --git a/wcfsetup/install/files/acp/templates/smileyList.tpl b/wcfsetup/install/files/acp/templates/smileyList.tpl
index 7189d2688fe9e28a365f48d9a2ab05499255b051..c101ad73fb3a6e0a6c49ef78c440a21faa16af83 100644 (file)
--- a/wcfsetup/install/files/acp/templates/smileyList.tpl
+++ b/wcfsetup/install/files/acp/templates/smileyList.tpl
@@ -65,7 +65,7 @@
                                        <p class="info">{lang}wcf.global.noItems{/lang}</p>
                                {/if}
                        </section>
-               </div>  
+               </div>
        </div>
 {else}
        <p class="info">{lang}wcf.global.noItems{/lang}</p>

diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 12d152aed36accea98c8f548f8d22e044026f983..6e6beaffbfd25af944c6059e0d7e738cb1789830 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -497,7 +497,7 @@
                                                                                </ol>
                                                                        </li>
                                                                </ol>
-                                                       </div>  
+                                                       </div>
                                                </div>
                                                
                                                <div id="spHeader" data-region="wcfHeader">
@@ -721,7 +721,7 @@
                                                </div>
                                        </div>
                                </div>
-                       </div>  
+                       </div>
                </div>
                
                <script>
@@ -911,7 +911,7 @@
                                        <dd>
                                                <div dir="ltr">
                                                        <textarea id="individualScss" rows="20" cols="40" name="individualScss">{$variables[individualScss]}</textarea>
-                                               </div>  
+                                               </div>
                                                <small>{lang}wcf.acp.style.advanced.individualScss.description{/lang}</small>
                                        </dd>
                                </dl>

diff --git a/wcfsetup/install/files/acp/templates/styleVariableColor.tpl b/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
index adea975667a28551e3ec72566493bd13b542f12d..7cb8e345f01b3e90247c4005781e246cde9c6668 100644 (file)
--- a/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
+++ b/wcfsetup/install/files/acp/templates/styleVariableColor.tpl
@@ -5,5 +5,5 @@
                <span class="dimmed">${$variableName}</span>
        </figcaption>
        <div class="colorPreview"><div class="jsColorPicker" style="background-color: {$variables[$variableName]}" data-color="{$variables[$variableName]}" data-store="{$variableName}_value"></div></div>
-       <input type="hidden" id="{$variableName}_value" name="{$variableName}" value="{$variables[$variableName]}"> 
+       <input type="hidden" id="{$variableName}_value" name="{$variableName}" value="{$variables[$variableName]}">
 </figure>
\ No newline at end of file

diff --git a/wcfsetup/install/files/acp/templates/userAdd.tpl b/wcfsetup/install/files/acp/templates/userAdd.tpl
index cee2e252c2a38ccf0ead3fdd256cdff0b41149bd..7148f0b6d3fcee5097a1d99ed56eaa03ac1656cf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@ -159,7 +159,7 @@
                                                <dt></dt>
                                                <dd>
                                                        <label><input type="checkbox" id="banned" name="banned" value="1"{if $banned == 1} checked{/if}> {lang}wcf.acp.user.banUser{/lang}</label>
-                                                       <small>{lang}wcf.acp.user.banUser.description{/lang}</small>    
+                                                       <small>{lang}wcf.acp.user.banUser.description{/lang}</small>
                                                </dd>
                                        </dl>
                                        

diff --git a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
index fadc3fefe8d3f92a0762efaa5ff0dc2ede19b6f5..80c0012f54b21f3738f0d31cb292578e04c26f52 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
+++ b/wcfsetup/install/files/acp/templates/userOptionSetDefaults.tpl
@@ -27,7 +27,7 @@
                                <dt></dt>
                                <dd>
                                        <label><input type="checkbox" name="applyChangesToExistingUsers" value="1"{if $applyChangesToExistingUsers} checked{/if}> {lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers{/lang}</label>
-                                       <small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>     
+                                       <small>{lang}wcf.acp.user.option.setDefaults.applyChangesToExistingUsers.description{/lang}</small>
                                </dd>
                        </dl>
                </div>

diff --git a/wcfsetup/install/files/acp/templates/userSearch.tpl b/wcfsetup/install/files/acp/templates/userSearch.tpl
index 016491c968d21d750be1c4ffc443b8dfc25f6374..cc9f2396109c6077f0d76402b6322d8e273bdeea 100644 (file)
--- a/wcfsetup/install/files/acp/templates/userSearch.tpl
+++ b/wcfsetup/install/files/acp/templates/userSearch.tpl
@@ -119,7 +119,7 @@
                </section>
                
                {event name='resultOptionSections'}
-       </section>      
+       </section>
        
        <div class="formSubmit">
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">

diff --git a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
index 96b7ac2feb0d1831e798133bc887c01eed1b8fd6..719c848c61be755be3cd4f75fe9b0cc3f11bc81e 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
+++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
@@ -98,7 +98,7 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
                                        <input type="hidden" name="no_shipping" value="1">
                                        <input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback')).'">
                                        <input type="hidden" name="quantity" value="1">
-                                       <input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">      
+                                       <input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">
                                        
                                        <button class="small" type="submit">'.WCF::getLanguage()->get('wcf.payment.paypal.button.purchase').'</button>
                                </form>';

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 56f1274209ca36ccbe8f57c89ae06f04f0cb4e4f..504ba857811b7c419c3a4472cd57195ad98ca535 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -51,7 +51,7 @@
                <item name="wcf.global.configureDB.database"><![CDATA[Database Name]]></item>
                <item name="wcf.global.configureDB.database.description"><![CDATA[The database must already exist.]]></item>
                <item name="wcf.global.configureDB.number"><![CDATA[Installation Number]]></item>
-               <item name="wcf.global.configureDB.number.description"><![CDATA[The installation number allows you to install multiple installations of this software into the same database. If this is your first installation in this database, you should enter <em>1</em>.]]></item>       
+               <item name="wcf.global.configureDB.number.description"><![CDATA[The installation number allows you to install multiple installations of this software into the same database. If this is your first installation in this database, you should enter <em>1</em>.]]></item>
                <item name="wcf.global.configureDB.error"><![CDATA[An error has occurred while trying to connect to your database:
                <br><strong>{$exception->getMessage()}{if $exception->getPrevious()}<br>{$exception->getPrevious()->getMessage()}{/if}</strong>]]></item>
                <item name="wcf.global.configureDB.conflictedTables"><![CDATA[The following table{if $conflictedTables|count > 1}s{/if} already exist{if $conflictedTables|count == 1}s{/if} within your “{$dbName}” Database:<br>{implode from=$conflictedTables item="table"}{$table}{/implode}.<br><br>To solve this problem, please do one of the following:<br>1. Remove the table{if $conflictedTables|count > 1}s{/if} manually and continue the installation with the “Next” button or<br>2. You re-enter the database access information, but to a different database and continue the installation with the “Next” button or<br>3. Enter a new installation number, not forgetting to continue the installation with the “Next” Button.]]></item>

diff --git a/wcfsetup/setup/template/stepNext.tpl b/wcfsetup/setup/template/stepNext.tpl
index 6773ee9454340bb725554eb017a4174518fce684..ba0f5d1c9d1f0110f3b7e159c010fd271e8008be 100644 (file)
--- a/wcfsetup/setup/template/stepNext.tpl
+++ b/wcfsetup/setup/template/stepNext.tpl
@@ -5,7 +5,7 @@
                <h2 class="sectionTitle">{lang}wcf.global.next{/lang}</h2>
                <p class="sectionDescription">{lang}wcf.global.next.description{/lang}</p>
        </header>
-</section>     
+</section>
 
 <form method="post" action="install.php?step={@$nextStep}">
        <div class="formSubmit">