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

[mailer.git] / inc / libs / optimize_functions.php

diff --git a/inc/libs/optimize_functions.php b/inc/libs/optimize_functions.php
index cefbd46fa43f3eb5bac8f5f662cce87ab056b11d..e6f2101f9219f1795c57753ee91037da9bc9d662 100644 (file)
--- a/inc/libs/optimize_functions.php
+++ b/inc/libs/optimize_functions.php
@@ -42,15 +42,15 @@ if (!defined('__SECURITY')) {
 //
 function REPAIR_OPTIMIZE_DB()
 {
-       global $MySQL;
        $ret = array();
        $tot_data = 0; $tabs = 0; $opts = 0;
        $tot_idx = 0; $total_gain = 0;
        $tot_all = 0;
-       $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".$MySQL['dbase'], __FILE__, __LINE__);
+       $result = @SQL_QUERY("SHOW TABLE STATUS FROM ".__DB_NAME, __FILE__, __LINE__);
        $tabs = @SQL_NUMROWS($result);
        $ret['total_size'] = 0;
        $ret['total_tabs'] = $tabs;
+       $ret['tables'] = array();
        if ($tabs > 0)
        {
                while ($row = SQL_FETCHARRAY($result))
@@ -85,10 +85,10 @@ function REPAIR_OPTIMIZE_DB()
        $ret['total_gain'] = $total_gain;
 
        // Insert new row
-       $result = SQL_QUERY("INSERT INTO "._MYSQL_PREFIX."_optimize_gain (gain) VALUES ('".$total_gain."')", __FILE__, __LINE__);
+       $result = SQL_QUERY("INSERT INTO `{!MYSQL_PREFIX!}_optimize_gain` (gain) VALUES ('".$total_gain."')", __FILE__, __LINE__);
 
        // Get total runs and total optimization count
-       $result = SQL_QUERY("SELECT COUNT(id) AS rows, SUM(gain) AS opti FROM "._MYSQL_PREFIX."_optimize_gain", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT COUNT(id) AS rows, SUM(gain) AS opti FROM `{!MYSQL_PREFIX!}_optimize_gain`", __FILE__, __LINE__);
        list($total_rows, $total_opti) = SQL_FETCHROW($result);
 
        // Free memory