From 79f0a612c4d9db3c01d3ceec1d74d8e39d0b9275 Mon Sep 17 00:00:00 2001
From: Michael Dikih <michael.dikih@netspot.com.au>
Date: Thu, 28 Nov 2013 16:56:03 +1030
Subject: [PATCH] MDL-43109: mod/wiki - When editing pages populate the default
 value for the tags input.

---
 mod/wiki/edit_form.php | 2 --
 mod/wiki/pagelib.php   | 6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/mod/wiki/edit_form.php b/mod/wiki/edit_form.php
index 2d34a6cf737..088b7fbcfc8 100644
--- a/mod/wiki/edit_form.php
+++ b/mod/wiki/edit_form.php
@@ -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);
         }
 
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index d4946a6c3f9..803a7db5509 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -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);
             }
         }