Changed name of upgrade_moodle function to main_upgrade (for consistency)

diff --git a/admin/index.php b/admin/index.php
index cc6fc72ca9628d633a530b94f161ca482a162da1..dda74bbb977e5dddfe0bf33374239e855be6ba1b 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -68,7 +68,7 @@
             print_header($strdatabasechecking, $strdatabasechecking, $strdatabasechecking);
             notify($strdatabasechecking);
             $db->debug=true;
-            if (upgrade_moodle($CFG->version)) {
+            if (main_upgrade($CFG->version)) {
                 $db->debug=false;
                 if (set_config("version", $version)) {
                     notify($strdatabasesuccess);
@@ -95,7 +95,7 @@
             die;
         } else {
             $db->debug=true;
-            if (upgrade_moodle(0)) {
+            if (main_upgrade(0)) {
                 print_continue("index.php");
             } else {
                 error("A problem occurred inserting current version into databases");

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 5fdd2b0e068888e496db9745c1de963610abe2af..9eb5363792da6e61f9309bb5a40d032875af2eca 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -17,7 +17,7 @@
 //
 // This file is tailored to MySQL
 
-function upgrade_moodle($oldversion=0) {
+function main_upgrade($oldversion=0) {
 
     if ($oldversion == 0) {
         execute_sql("

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 8cb8b6e6e0fb13ef0b608ff538bba513ab9250ed..385b4b6b1eea18ac46e8c5dc07ba5478e1a60bdf 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -17,7 +17,7 @@
 //
 // This file is tailored to PostgreSQL 7
 
-function upgrade_moodle($oldversion=0) {
+function main_upgrade($oldversion=0) {
 
     return true;
 }