All database names are now 'back-ticked' and constant _MYSQL_PREFIX is wrapped. Partl...

[mailer.git] / inc / modules / admin / what-list_task.php

diff --git a/inc/modules/admin/what-list_task.php b/inc/modules/admin/what-list_task.php
index dff8a1df47957af927eaaf5c30a8460387931d52..ff48e0d633ec6837c6445744a00db329141c7fb0 100644 (file)
--- a/inc/modules/admin/what-list_task.php
+++ b/inc/modules/admin/what-list_task.php
@@ -90,7 +90,7 @@ if (!empty($whereStatement))
        } else {
                // Start listing tasks matching selected filter
                $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created
-FROM "._MYSQL_PREFIX."_task_system
+FROM `{!MYSQL_PREFIX!}_task_system`
 WHERE ".$whereStatement."
 ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __LINE__);
                if (($SEL > 0) && (!IS_DEMO())) {
@@ -98,7 +98,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        if (isset($_POST['unassign'])) {
                                // Unassign from tasks
                                foreach ($_POST['task'] as $id => $sel) {
-                                       SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{!MYSQL_PREFIX!}_task_system` SET assigned_admin=0 WHERE id=%s AND assigned_admin=%s LIMIT 1",
                                                array(bigintval($id), GET_CURRENT_ADMIN_ID()), __FILE__, __LINE__);
                                }
                        } elseif (isset($_POST['del'])) {
@@ -106,7 +106,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                                foreach ($_POST['task'] as $id => $sel) {
                                        if ($_GET['type'] == "deleted") {
                                                // Delete task immediately
-                                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_task_system WHERE id=%s LIMIT 1",
+                                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!MYSQL_PREFIX!}_task_system` WHERE id=%s LIMIT 1",
                                                        array(bigintval($id)),__FILE__, __LINE__);
                                        } else {
                                                // Mark task as to be deleted (purged by autppurge extension)
@@ -116,7 +116,7 @@ ORDER BY userid DESC, task_type DESC, subject, task_created DESC", __FILE__, __L
                        }
 
                        // Update query
-                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM "._MYSQL_PREFIX."_task_system WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
+                       $result_tasks = SQL_QUERY("SELECT id, assigned_admin, userid, task_type, subject, text, task_created FROM `{!MYSQL_PREFIX!}_task_system` WHERE ".$whereStatement." ORDER BY subject, task_created DESC", __FILE__, __LINE__);
                }
 
                // There are uncompleted jobs!