MDL-15666 Fixed some fatal errors in database generation

diff --git a/admin/generator.php b/admin/generator.php
index 71f427ee62fcf51d7471e4dfd1d77d901750813a..d83980c6d18e163f22ae5a3e90933b406a3055c0 100755 (executable)
--- a/admin/generator.php
+++ b/admin/generator.php
@@ -944,7 +944,7 @@ class generator {
                 $type = $database_field_types[array_rand($database_field_types)];
                 require_once($CFG->dirroot.'/mod/data/field/'.$type.'/field.class.php');
                 $newfield = 'data_field_'.$type;
-                $newfield = $newfield(0, $data, true);
+                $newfield = new $newfield(0, $data, true);
                 $fields[] = $newfield;
             }
 
@@ -1294,6 +1294,10 @@ class fake_form {
     function save_stored_file() {
         return true;
     }
+
+    function get_data() {
+        return array();
+    }
 }
 
 class generator_form extends moodleform {

diff --git a/lib/simpletest/testportfoliolib.php b/lib/simpletest/testportfoliolib.php
index 56808ac8872644c10e63eceea8a1c304f2889df3..780df57897290b23dfe6155b248d4a48d9eb77ed 100755 (executable)
--- a/lib/simpletest/testportfoliolib.php
+++ b/lib/simpletest/testportfoliolib.php
@@ -165,7 +165,10 @@ class portfoliolib_test extends UnitTestCase {
 }
 
 // Load tests for various modules
-require_once($CFG->dirroot . '/mod/forum/simpletest/test_forum_portfolio_callers.php');
-require_once($CFG->dirroot . '/mod/glossary/simpletest/test_glossary_portfolio_callers.php');
-require_once($CFG->dirroot . '/mod/assignment/simpletest/test_assignment_portfolio_callers.php');
+foreach (get_list_of_plugins('mod') as $module) {
+    $modtest = $CFG->dirroot . '/mod/' . $module . '/simpletest/test_' . $module . '_portfolio_callers.php';
+    if (file_exists($modtest)) {
+        require_once($modtest);
+    }
+}
 ?>