Merge branch 'mdl36506-moodle27' of git://github.com/tlock/moodle int…

…o MOODLE_27_STABLE
moodle · Mar 30, 2015 · 38ebaa2 · 38ebaa2
2 parents 0582523 + 9ad24a0
commit 38ebaa2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mod/book/db/upgradelib.php b/mod/book/db/upgradelib.php
@@ -108,12 +108,16 @@ function mod_book_migrate_moddata_dir_to_legacy($book, $context, $path) {
  * @return void
  */
 function mod_book_migrate_all_areas() {
-    global $DB;
+    global $DB, $OUTPUT;
 
     $rsbooks = $DB->get_recordset('book');
     foreach($rsbooks as $book) {
         upgrade_set_timeout(360); // set up timeout, may also abort execution
         $cm = get_coursemodule_from_instance('book', $book->id);
+        if (empty($cm) || empty($cm->id)) {
+             echo $OUTPUT->notification("Course module not found, skipping: {$book->name}");
+             continue;
+        }
         $context = context_module::instance($cm->id);
         mod_book_migrate_area($book, 'intro', 'book', $book->course, $context, 'mod_book', 'intro', 0);