Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 8 insertions, 2 deletions

diff --git a/modules/gallery/views/admin_maintenance.html.php b/modules/gallery/views/admin_maintenance.html.php
index ac597715..19375670 100644
--- a/modules/gallery/views/admin_maintenance.html.php
+++ b/modules/gallery/views/admin_maintenance.html.php
@@ -29,16 +29,22 @@
             <?= $task->description ?>
           </td>
           <td>
-            <a href="<?= url::site("admin/maintenance/start/$task->callback?csrf=$csrf") ?>"
+            <? foreach ($task_buttons as $button): ?>
+            <a href="<?= "{$button->url}/$task->callback?csrf=$csrf" ?>"
               class="g-dialog-link g-button ui-icon-left ui-state-default ui-corner-all">
-              <?= t("run") ?>
+              <?= html::clean($button->text) ?>
             </a>
+            <? endforeach ?>
           </td>
         </tr>
         <? endforeach ?>
       </table>
     </div>
 
+    <? foreach ($task_maintenance_content as $content): ?>
+    <?= html::purify($content) ?>
+    <? endforeach ?>
+
     <? if ($running_tasks->count()): ?>
     <div id="g-running-tasks">
       <h2> <?= t("Running tasks") ?> </h2>