Merge branch '5.3'

diff --cc wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
index c6eb65e6e6d11b750cc79cfcbb1bf053d03251a8,4835179d0c47d24fa5534631aac57508677a2195..31b83cd4a1b82e6afb35823817359c8c4ee2b8bd
--- 1/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
--- 2/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
+++ b/wcfsetup/install/files/acp/templates/captchaQuestionList.tpl
@@@ -20,9 -39,9 +20,9 @@@
        </div>
  {/hascontent}
  
- {hascontent}
+ {if $objects|count}
        <div id="captchaQuestionTabelContainer" class="section tabularBox">
 -              <table class="table">
 +              <table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\captcha\question\CaptchaQuestionAction">
                        <thead>
                                <tr>
                                        <th class="columnID columnQuestionID active ASC" colspan="2">{lang}wcf.global.objectID{/lang}</th>
@@@ -32,24 -51,22 +32,22 @@@
                                </tr>
                        </thead>
                        
 -                      <tbody>
 +                      <tbody class="jsReloadPageWhenEmpty">
-                               {content}
-                                       {foreach from=$objects item='question'}
-                                               <tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
-                                                       <td class="columnIcon">
-                                                               {objectAction action="toggle" isDisabled=$question->isDisabled}
-                                                               <a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-                                                               {objectAction action="delete" objectTitle=$question->getQuestion()}
-                                                               
-                                                               {event name='rowButtons'}
-                                                       </td>
-                                                       <td class="columnID columnQuestionID">{$question->questionID}</td>
-                                                       <td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{$question->getQuestion()}</a></td>
+                               {foreach from=$objects item='question'}
 -                                      <tr class="jsQuestionRow">
++                                      <tr class="jsQuestionRow jsObjectActionObject" data-object-id="{@$question->getObjectID()}">
+                                               <td class="columnIcon">
 -                                                      <span class="icon icon16 fa-{if !$question->isDisabled}check-{/if}square-o jsToggleButton jsTooltip pointer" title="{lang}wcf.global.button.{if $question->isDisabled}enable{else}disable{/if}{/lang}" data-object-id="{@$question->questionID}"></span>
++                                                      {objectAction action="toggle" isDisabled=$question->isDisabled}
+                                                       <a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
 -                                                      <span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$question->questionID}" data-confirm-message-html="{lang __encode=true}wcf.acp.captcha.question.delete.confirmMessage{/lang}"></span>
++                                                      {objectAction action="delete" objectTitle=$question->getQuestion()}
                                                        
-                                                       {event name='columns'}
-                                               </tr>
-                                       {/foreach}
-                               {/content}
+                                                       {event name='rowButtons'}
+                                               </td>
+                                               <td class="columnID columnQuestionID">{$question->questionID}</td>
+                                               <td class="columnText columnQuestion"><a href="{link controller='CaptchaQuestionEdit' id=$question->questionID}{/link}">{$question->getQuestion()}</a></td>
+                                               
+                                               {event name='columns'}
+                                       </tr>
+                               {/foreach}
                        </tbody>
                </table>
        </div>