- Daily/weekly/monthly reset completely rewritten

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

diff --git a/inc/libs/cache_functions.php b/inc/libs/cache_functions.php
index cfb4cd4cae6e0e23812ef2a5cb2287ddbdadc609..619579d5377425ef1ff8926e807723d9098a12ed 100644 (file)
--- a/inc/libs/cache_functions.php
+++ b/inc/libs/cache_functions.php
@@ -68,8 +68,7 @@ class mxchange_cache
                                // Is there a .htaccess file?
                                if (file_exists($path.".htaccess")) {
                                        // Update database that we have tested it
-                                       $result = SQL_QUERY("UPDATE "._MYSQL_PREFIX."_config SET cache_tested='1' WHERE config=0 LIMIT 1", __FILE__, __LINE__);
-                                       $this->ret="done";
+                                       UPDATE_CONFIG("cache_tested", 1);
 
                                        // All done!
                                        return "done";
@@ -262,13 +261,13 @@ class mxchange_cache
                                                foreach($v as $k2=>$v2)
                                                {
                                                        // Put every array element in a row...
-                                                       $LINE .= "\$cacheInstance['".$k."'][] = \"".$v2."\";\n";
+                                                       $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n";
                                                }
                                        }
                                        else
                                        {
                                                // Single line found
-                                               $LINE = "\$cacheInstance['".$k."'] = \"".$v."\";\n";
+                                               $LINE = "\$data['".$k."'] = \"".$v."\";\n";
                                        }
 
                                        // Write line(s)
@@ -325,13 +324,13 @@ class mxchange_cache
                                                        foreach($v as $k2=>$v2)
                                                        {
                                                                // Put every array element in a row...
-                                                               $LINE .= "\$cacheInstance['".$k."'][] = \"".$v2."\";\n";
+                                                               $LINE .= "\$data['".$k."'][] = \"".$v2."\";\n";
                                                        }
                                                }
                                                else
                                                {
                                                        // Single line found
-                                                       $LINE = "\$cacheInstance['".$k."'] = \"".$v."\";\n";
+                                                       $LINE = "\$data['".$k."'] = \"".$v."\";\n";
                                                }
 
                                                // Write line(s)