Issue 3331: Removed unneeded table "deliverq"

diff --git a/mod/admin.php b/mod/admin.php
index e86bb90ddda94c658502f583b2f06dabc706277b..2652b33c12bc90ec36d73add8aaa14d361e862f9 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -474,9 +474,6 @@ function admin_page_summary(App $a) {
        $r = qu("SELECT COUNT(`id`) AS `count` FROM `register`");
        $pending = $r[0]['count'];
 
-       $r = qu("SELECT COUNT(*) AS `total` FROM `deliverq` WHERE 1");
-       $deliverq = (($r) ? $r[0]['total'] : 0);
-
        $r = qu("SELECT COUNT(*) AS `total` FROM `queue` WHERE 1");
        $queue = (($r) ? $r[0]['total'] : 0);
 
@@ -485,7 +482,7 @@ function admin_page_summary(App $a) {
 
        // We can do better, but this is a quick queue status
 
-       $queues = array('label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue, 'workerq' => $workerqueue);
+       $queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue);
 
 
        $t = get_markup_template("admin_summary.tpl");

diff --git a/view/templates/admin_summary.tpl b/view/templates/admin_summary.tpl
index a8243b6149f57dcb96637655c45327aa9be9f726..e650144134960f583579228821372ada5fe20461 100644 (file)
--- a/view/templates/admin_summary.tpl
+++ b/view/templates/admin_summary.tpl
@@ -11,7 +11,7 @@
 
        <dl>
                <dt>{{$queues.label}}</dt>
-               <dd>{{$queues.deliverq}} - <a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
+               <dd><a href="{{$baseurl}}/admin/queue">{{$queues.queue}}</a> - {{$queues.workerq}}</dd>
        </dl>
        <dl>
                <dt>{{$pending.0}}</dt>