moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle

Browse source
This commit is contained in:
Marina Glancy 2014-03-25 14:03:06 +08:00
commit 81e50a3661
28 changed files with 582 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mod/wiki/backup/moodle2/restore_wiki_stepslib.php
View file

@ -165,7 +165,10 @@ class restore_wiki_activity_structure_step extends restore_activity_structure_st
$tag = $data->rawname;
$itemid = $this->get_new_parentid('wiki_page');
tag_set_add('wiki_pages', $itemid, $tag);
$wikiid = $this->get_new_parentid('wiki');
$cm = get_coursemodule_from_instance('wiki', $wikiid);
tag_set_add('wiki_pages', $itemid, $tag, 'mod_wiki', context_module::instance($cm->id)->id);
}
protected function after_execute() {

2
mod/wiki/pagelib.php
View file

@ -2035,7 +2035,7 @@ class page_wiki_save extends page_wiki_edit {
if ($save && $data) {
if (!empty($CFG->usetags)) {
tag_set('wiki_pages', $this->page->id, $data->tags);
tag_set('wiki_pages', $this->page->id, $data->tags, 'mod_wiki', $this->modcontext->id);
}
$message = '<p>' . get_string('saving', 'wiki') . '</p>';