text_cache --> cache_text much better

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 710672f4c867e9a4571e4ef9ae407479d69dcbd3..db4f9d4dddb16b4c12e3ed5792e80345cd0a2619 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -643,8 +643,8 @@ function main_upgrade($oldversion=0) {
         table_column("course", "", "lang", "varchar", "5", "", "", "", "groupmodeforce");
     }
 
-    if ($oldversion < 2004020902) {
-        modify_database("", "CREATE TABLE `prefix_text_cache` (
+    if ($oldversion < 2004020903) {
+        modify_database("", "CREATE TABLE `prefix_cache_text` (
                                 `id` int(10) unsigned NOT NULL auto_increment,
                                 `md5key` varchar(32) NOT NULL default '',
                                 `formattedtext` longtext NOT NULL,

diff --git a/lib/db/mysql.sql b/lib/db/mysql.sql
index 651b38c7db5954f7795ba8865da80be8560e7e79..92c62186eeecf0c18554d705efb7aea2abf2620a 100644 (file)
--- a/lib/db/mysql.sql
+++ b/lib/db/mysql.sql
@@ -158,10 +158,10 @@ CREATE TABLE `prefix_event` (
 # --------------------------------------------------------
 
 #
-# Table structure for table `text_cache`
+# Table structure for table `cache_text`
 #
 
-CREATE TABLE `prefix_text_cache` (
+CREATE TABLE `prefix_cache_text` (
   `id` int(10) unsigned NOT NULL auto_increment,
   `md5key` varchar(32) NOT NULL default '',
   `formattedtext` longtext NOT NULL,

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 173fa09a5b074dfe929704221d1c9b4fb0c85964..4f10dcc306617b6c672d4142c39a767bcdd7a41b 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -389,8 +389,8 @@ function main_upgrade($oldversion=0) {
         table_column("course", "", "lang", "varchar", "5", "", "", "", "groupmodeforce");
     }
 
-    if ($oldversion < 2004020902) {
-        modify_database("", "CREATE TABLE prefix_text_cache (
+    if ($oldversion < 2004020903) {
+        modify_database("", "CREATE TABLE prefix_cache_text (
                                 id SERIAL PRIMARY KEY,
                                 md5key varchar(32) NOT NULL default '',
                                 formattedtext text,

diff --git a/lib/db/postgres7.sql b/lib/db/postgres7.sql
index 1a57c320db04a3db76f2a1a0c414caa5d9dfbe84..3538f4b389c29f2e28f8ed6b61cdcc80ddf93ec6 100644 (file)
--- a/lib/db/postgres7.sql
+++ b/lib/db/postgres7.sql
@@ -165,7 +165,7 @@ CREATE TABLE prefix_scale (
    timemodified integer NOT NULL default '0'
 );
 
-CREATE TABLE prefix_text_cache (
+CREATE TABLE prefix_cache_text (
    id SERIAL PRIMARY KEY,
    md5key varchar(32) NOT NULL default '',
    formattedtext text,

diff --git a/lib/weblib.php b/lib/weblib.php
index 8120fbd1efd9dd46a3bebe1c06b9bc909333fb3f..301e5df4a4392379effc4791234cac8a5b65b5c3 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -494,7 +494,7 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
     if (!empty($CFG->cachetext)) {
         $time = time() - $CFG->cachetext;
         $md5key = md5($text);
-        if ($cacheitem = get_record_select('text_cache', "md5key = '$md5key' AND timemodified > '$time'")) {
+        if ($cacheitem = get_record_select('cache_text', "md5key = '$md5key' AND timemodified > '$time'")) {
             return $cacheitem->formattedtext;
         }
     }
@@ -539,7 +539,7 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
         $newrecord->md5key = $md5key;
         $newrecord->formattedtext = addslashes($text);
         $newrecord->timemodified = time();
-        insert_record('text_cache', $newrecord);
+        insert_record('cache_text', $newrecord);
     }
 
     return $text;

diff --git a/version.php b/version.php
index 1637f4c9e3bf4fa47d06ace0ad9e1a027f77fe2f..e6683c20c6942ef45882565f637167534fae06ef 100644 (file)
--- a/version.php
+++ b/version.php
@@ -5,7 +5,7 @@
 // database to determine whether upgrades should
 // be performed (see lib/db/*.php)
 
-$version = 2004020902;   // The current version is a date (YYYYMMDDXX)
+$version = 2004020903;   // The current version is a date (YYYYMMDDXX)
 
 $release = "1.2 development";   // User-friendly version number