From 41b997b1fff323ab2f91e3b0c6743d2baef36927 Mon Sep 17 00:00:00 2001 From: Ankit Agarwal Date: Tue, 4 Sep 2012 11:56:21 +0800 Subject: [PATCH] MDL-35007 book: Adding rule to parse links to book chapters from 1.9 backups Conflicts: mod/book/version.php --- mod/book/backup/moodle2/restore_book_activity_task.class.php | 3 ++- mod/book/version.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/book/backup/moodle2/restore_book_activity_task.class.php b/mod/book/backup/moodle2/restore_book_activity_task.class.php index d9ee50e1448cc..3755f6830ec6d 100644 --- a/mod/book/backup/moodle2/restore_book_activity_task.class.php +++ b/mod/book/backup/moodle2/restore_book_activity_task.class.php @@ -82,8 +82,9 @@ static public function define_decode_rules() { $rules[] = new restore_decode_rule('BOOKVIEWBYB', '/mod/book/view.php?b=$1', 'book'); $rules[] = new restore_decode_rule('BOOKVIEWBYBCH', '/mod/book/view.php?b=$1&chapterid=$2', array('book', 'book_chapter')); - // Convert old book links MDL-33362 + // Convert old book links MDL-33362 & MDL-35007 $rules[] = new restore_decode_rule('BOOKSTART', '/mod/book/view.php?id=$1', 'course_module'); + $rules[] = new restore_decode_rule('BOOKCHAPTER', '/mod/book/view.php?id=$1&chapterid=$2', array('course_module', 'book_chapter')); return $rules; } diff --git a/mod/book/version.php b/mod/book/version.php index 84a16383b1199..e187cb33144c3 100644 --- a/mod/book/version.php +++ b/mod/book/version.php @@ -25,6 +25,6 @@ defined('MOODLE_INTERNAL') || die; $module->component = 'mod_book'; // Full name of the plugin (used for diagnostics) -$module->version = 2012061701; // The current module version (Date: YYYYMMDDXX) +$module->version = 2012061702; // The current module version (Date: YYYYMMDDXX) $module->requires = 2012061700; // Requires this Moodle version $module->cron = 0; // Period for cron to check this module (secs)