mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 07:56:06 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-43109' of https://github.com/mdikih/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2014-01-13 21:51:27 +01:00
commit 295f7a6137
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/wiki/edit_form.php
View File

@ -101,10 +101,8 @@ class mod_wiki_edit_form extends moodleform {
$mform->setType('contentformat', PARAM_ALPHANUMEXT);
if (!empty($CFG->usetags)) {
$tags = !isset($this->_customdata['tags'])?"":$this->_customdata['tags'];
$mform->addElement('header', 'tagshdr', get_string('tags', 'tag'));
$mform->addElement('tags', 'tags', get_string('tags'));
$mform->setDefault('tags', $tags);
$mform->setType('tags', PARAM_TEXT);
}

6
mod/wiki/pagelib.php
View File

@ -562,10 +562,6 @@ class page_wiki_edit extends page_wiki {
$params['filearea'] = 'attachments';
}
if (!empty($CFG->usetags)) {
$params['tags'] = tag_get_tags_csv('wiki_pages', $this->page->id, TAG_RETURN_TEXT);
}
$form = new mod_wiki_edit_form($url, $params);
if ($formdata = $form->get_data()) {
@ -574,7 +570,7 @@ class page_wiki_edit extends page_wiki {
}
} else {
if (!empty($CFG->usetags)) {
$data->tags = tag_get_tags_array('wiki', $this->page->id);
$data->tags = tag_get_tags_array('wiki_pages', $this->page->id);
}
}