MDL-14599 removed support for old main $CFG->dbtype.php upgrade support

diff --git a/admin/cliupgrade.php b/admin/cliupgrade.php
index b2189ceccebf26a7cfb5218a8893421ff782fdac..207fa0975f7dd020b26e485de98e175c5eb474c0 100644 (file)
--- a/admin/cliupgrade.php
+++ b/admin/cliupgrade.php
@@ -870,8 +870,6 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
         $status = false;
         if (file_exists("$CFG->libdir/db/install.xml")) {
             $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
-        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
-            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
         } else {
             console_write(STDERR,"Error: Your database ($CFG->dbtype) is not yet fully supported by Moodle or install.xml is not present.  See the lib/db directory.",'',false);
         }
@@ -921,9 +919,6 @@ if ( file_exists(dirname(dirname(__FILE__)) . '/config.php')) {
     /// Check version of Moodle code on disk compared with database
     /// and upgrade if possible.
 
-    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
-        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
-    }
     if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
         include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
     }

diff --git a/admin/index.php b/admin/index.php
index 051d1d40daa849feec436047fe671fa974fcc849..7cf0531d3f8362441194c1364bc4a8962ce240b7 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -178,8 +178,6 @@
         $status = false;
         if (file_exists("$CFG->libdir/db/install.xml")) {
             $status = install_from_xmldb_file("$CFG->libdir/db/install.xml"); //New method
-        } else if (file_exists("$CFG->libdir/db/$CFG->dbtype.sql")) {
-            $status = modify_database("$CFG->libdir/db/$CFG->dbtype.sql"); //Old method
         } else {
             print_error('dbnotsupport', 'debug', '', $CFG->dbtype);
         }
@@ -229,9 +227,6 @@
 /// Check version of Moodle code on disk compared with database
 /// and upgrade if possible.
 
-    if (file_exists("$CFG->dirroot/lib/db/$CFG->dbtype.php")) {
-        include_once("$CFG->dirroot/lib/db/$CFG->dbtype.php");  # defines old upgrades
-    }
     if (file_exists("$CFG->dirroot/lib/db/upgrade.php")) {
         include_once("$CFG->dirroot/lib/db/upgrade.php");  # defines new upgrades
     }