From 6f1b029b6f07bc1ca9789425a678581ed4af3978 Mon Sep 17 00:00:00 2001
From: Dongsheng Cai <unoter@gmail.com>
Date: Wed, 17 Nov 2010 09:04:46 +0000
Subject: [PATCH] MDL-22449, improve wiki help info

---
 mod/wiki/edit_form.php    | 13 ++++++++++---
 mod/wiki/lang/en/wiki.php |  2 ++
 mod/wiki/pagelib.php      |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/mod/wiki/edit_form.php b/mod/wiki/edit_form.php
index 61c780466a6..17f6d14e3d5 100644
--- a/mod/wiki/edit_form.php
+++ b/mod/wiki/edit_form.php
@@ -52,14 +52,21 @@ class mod_wiki_edit_form extends moodleform {
             $fileitemid = $this->_customdata['fileitemid'];
         }
 
+        if (isset($this->_customdata['pagetitle'])) {
+            $pagetitle = get_string('editingpage', 'wiki', $this->_customdata['pagetitle']);
+        } else {
+            $pagetitle = get_string('editing', 'wiki');
+        }
+
         //editor
-        $mform->addElement('header', 'general', get_string('general'));
+        $mform->addElement('header', 'general', $pagetitle);
 
+        $fieldname = get_string('format' . $format, 'wiki');
         if ($format != 'html') {
-            $mform->addElement('wikieditor', 'newcontent', get_string('content'), array('cols' => 50, 'rows' => 20, 'wiki_format' => $format));
+            $mform->addElement('wikieditor', 'newcontent', $fieldname, array('cols' => 50, 'rows' => 20, 'wiki_format' => $format));
             $mform->addHelpButton('newcontent', 'format'.$format, 'wiki');
         } else {
-            $mform->addElement('editor', 'newcontent_editor', get_string('content'), null, page_wiki_edit::$attachmentoptions);
+            $mform->addElement('editor', 'newcontent_editor', $fieldname, null, page_wiki_edit::$attachmentoptions);
             $mform->addHelpButton('newcontent_editor', 'formathtml', 'wiki');
 
         }
diff --git a/mod/wiki/lang/en/wiki.php b/mod/wiki/lang/en/wiki.php
index c506cada3ee..82603a0aadb 100644
--- a/mod/wiki/lang/en/wiki.php
+++ b/mod/wiki/lang/en/wiki.php
@@ -48,7 +48,9 @@ $string['diff_help'] = 'Selected versions of the page may be compared in order t
 $string['edit'] = 'Edit';
 $string['editcomment'] = 'Edit comment';
 $string['editblocks'] = 'Turn edit blocks on';
+$string['editing'] = 'Editing wiki page';
 $string['editingcomment'] = 'Editing comment';
+$string['editingpage'] = 'Editing this page \'{$a}\'';
 $string['editblocks'] = 'Turn edit blocks on';
 $string['filenotuploadederror'] = 'File \'{$a}\' could not be uploaded correctly.';
 $string['filtername'] = 'Wiki Auto-linking';
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index dd83e192daf..866ec67126b 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -527,7 +527,7 @@ class page_wiki_edit extends page_wiki {
             $url .= "&section=" . $this->section;
         }
 
-        $params = array('attachmentoptions' => page_wiki_edit::$attachmentoptions, 'format' => $version->contentformat, 'version' => $versionnumber);
+        $params = array('attachmentoptions' => page_wiki_edit::$attachmentoptions, 'format' => $version->contentformat, 'version' => $versionnumber, 'pagetitle'=>$this->page->title);
 
         $data = new StdClass();
         $data->newcontent = $content;
-- 
2.11.4.GIT