Now assignment submodules are installed/upgraded properly

(using the standard plugins architecture) MDL-11029

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 178be17b6775b2a4e4b04e01aa7161b4c230c54b..71889395ae81aa5eccd3b535fd8af83bcc1e8341 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -2639,83 +2639,12 @@ function assignment_types() {
  * Executes upgrade scripts for assignment types when necessary
  */
 function assignment_upgrade_submodules() {
-    global $CFG;
-
-    $types = assignment_types();
-
-    include($CFG->dirroot.'/mod/assignment/version.php');  // defines $module with version etc
-
-    foreach ($types as $type => $typename) {
-
-        $fullpath = $CFG->dirroot.'/mod/assignment/type/'.$type;
-
-    /// Check for an external version file (defines $submodule)
-
-        if (!is_readable($fullpath .'/version.php')) {
-            continue;
-        }
-        include_once($fullpath .'/version.php');
-
-    /// Check whether we need to upgrade
-
-        if (!isset($submodule->version)) {
-            continue;
-        }
-
-    /// Make sure this submodule will work with this assignment version
-
-        if (isset($submodule->requires) and ($submodule->requires > $module->version)) {
-            notify("Assignment submodule '$type' is too new for your assignment");
-            continue;
-        }
-
-    /// If the submodule is new, then let's install it!
-
-        $currentversion = 'assignment_'.$type.'_version';
-
-        if (!isset($CFG->$currentversion)) {   // First install!
-            set_config($currentversion, $submodule->version);  // Must keep track of version
 
-            if (!is_readable($fullpath .'/db/'.$CFG->dbtype.'.sql')) {
-                continue;
-            }
-
-            upgrade_log_start();
-            $db->debug=true;
-            if (!modify_database($fullpath .'/db/'.$CFG->dbtype.'.sql')) {
-                notify("Error installing tables for submodule '$type'!");
-            }
-            $db->debug=false;
-            continue;
-        }
-
-    /// See if we need to upgrade
-
-        if ($submodule->version <= $CFG->$currentversion) {
-            continue;
-        }
-
-    /// Look for the upgrade file
-
-        if (!is_readable($fullpath .'/db/'.$CFG->dbtype.'.php')) {
-            continue;
-        }
-
-        include_once($fullpath .'/db/'. $CFG->dbtype .'.php');  // defines assignment_xxx_upgrade
+    global $CFG;
 
-    /// Perform the upgrade
+/// Install/upgrade assignment types (it uses, simply, the standard plugin architecture)
+    upgrade_plugins('assignment_type', 'mod/assignment/type', "$CFG->wwwroot/$CFG->admin/index.php");
 
-        $upgrade_function = 'assignment_'.$type.'_upgrade';
-        if (function_exists($upgrade_function)) {
-            upgrade_log_start();
-            $db->debug=true;
-            if ($upgrade_function($CFG->$currentversion)) {
-                $db->debug=false;
-                set_config($currentversion, $submodule->version);
-            }
-            $db->debug=false;
-        }
-    }
 }
 
 function assignment_print_overview($courses, &$htmlarray) {