Merge "Bug 1769546: Needing to update raw_old theme for backported patches" into 17.04_STABLE

htdocs/theme/raw_old/plugintype/interaction/forum/templates/index.tpl

@@ -82,6 +82,7 @@
                     {/if}
                 </td>
 
+                {if $admin}
                 <td class="right control-buttons">
                     <div class="btn-group">
                         <a href="{$WWWROOT}interaction/edit.php?id={$forum->id}&amp;returnto=index" class="btn btn-default btn-sm" title="{str tag=edit}">
@@ -95,6 +96,7 @@
                         </a>
                     </div>
                 </td>
+                {/if}
             </tr>
         {/foreach}
         <tbody>

htdocs/theme/raw_old/plugintype/interaction/forum/templates/view.tpl

@@ -132,14 +132,14 @@
                     {str tag="updateselectedtopics" section="interaction.forum"}
                 </button>
             </span>
+            {if $moderator}
+                {contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
+            {else}
+                {contextualhelp plugintype='interaction' pluginname='forum' section='update'}
+            {/if}
         </div>
         {/if}
         <input type="hidden" name="sesskey" value="{$SESSKEY}">
-        {if $moderator}
-        {contextualhelp plugintype='interaction' pluginname='forum' section='updatemod'}
-        {else}
-        {contextualhelp plugintype='interaction' pluginname='forum' section='update'}
-        {/if}
     </form>
 </div>
 

htdocs/theme/raw_old/templates/admin/users/edit.tpl

@@ -12,6 +12,13 @@
         {/if}
         {$suspendform2|safe}
    </div>
+{elseif $expired}
+    <div class="suspendederror admin-warning alert alert-warning">
+        <h3 class="title">{$expiredon}</h3>
+        <div class="detail">
+            {str tag=unexpiredesc section=admin}
+        </div>
+   </div>
 {/if}
     <div class="row">
         <div class="col-md-9 main">