diff --git a/mod/page/backup/moodle2/restore_page_stepslib.php b/mod/page/backup/moodle2/restore_page_stepslib.php index 71409c77133..779604ecceb 100644 --- a/mod/page/backup/moodle2/restore_page_stepslib.php +++ b/mod/page/backup/moodle2/restore_page_stepslib.php @@ -56,5 +56,6 @@ class restore_page_activity_structure_step extends restore_activity_structure_st protected function after_execute() { // Add page related files, no need to match by itemname (just internally handled context) $this->add_related_files('mod_page', 'intro', null); + $this->add_related_files('mod_page', 'content', null); } } diff --git a/mod/url/backup/moodle2/backup_url_activity_task.class.php b/mod/url/backup/moodle2/backup_url_activity_task.class.php index d5fdd5036ea..8ebb801dbd2 100644 --- a/mod/url/backup/moodle2/backup_url_activity_task.class.php +++ b/mod/url/backup/moodle2/backup_url_activity_task.class.php @@ -60,18 +60,18 @@ class backup_url_activity_task extends backup_activity_task { $base = preg_quote($CFG->wwwroot.'/mod/url','#'); //Access a list of all links in a course - $pattern = '#'.$base.'/index\.php\?id=([0-9]+)#'; - $replacement = '$@URLVIEWLIST*$2@$'; + $pattern = '#('.$base.'/index\.php\?id=)([0-9]+)#'; + $replacement = '$@URLINDEX*$2@$'; $content = preg_replace($pattern, $replacement, $content); //Access the link supplying a course module id - $pattern = '#'.$base.'/view\.php\?id=([0-9]+)#'; - $replacement = '$@URLVIEWBYCOURSEMODULE*$2@$'; + $pattern = '#('.$base.'/view\.php\?id=)([0-9]+)#'; + $replacement = '$@URLVIEWBYID*$2@$'; $content = preg_replace($pattern, $replacement, $content); //Access the link supplying an instance id - $pattern = '#'.$base.'/view\.php\?u=([0-9]+)#'; - $replacement = '$@URLVIEWBYINSTANCEID*$2@$'; + $pattern = '#('.$base.'/view\.php\?u=)([0-9]+)#'; + $replacement = '$@URLVIEWBYU*$2@$'; $content = preg_replace($pattern, $replacement, $content); return $content; diff --git a/mod/url/backup/moodle2/restore_url_activity_task.class.php b/mod/url/backup/moodle2/restore_url_activity_task.class.php index 27f9862870e..d6e21f8fae6 100644 --- a/mod/url/backup/moodle2/restore_url_activity_task.class.php +++ b/mod/url/backup/moodle2/restore_url_activity_task.class.php @@ -66,8 +66,9 @@ class restore_url_activity_task extends restore_activity_task { static public function define_decode_rules() { $rules = array(); - $rules[] = new restore_decode_rule('URLVIEWBYID', '/mod/url/view.php?id=$1', 'course_module'); $rules[] = new restore_decode_rule('URLINDEX', '/mod/url/index.php?id=$1', 'course'); + $rules[] = new restore_decode_rule('URLVIEWBYID', '/mod/url/view.php?id=$1', 'course_module'); + $rules[] = new restore_decode_rule('URLVIEWBYU', '/mod/url/view.php?u=$1', 'url'); return $rules;