diff --git a/mod/wiki/diff/difflib.php b/mod/wiki/diff/difflib.php
index 61315e66b8c..da5c1540f6a 100644
--- a/mod/wiki/diff/difflib.php
+++ b/mod/wiki/diff/difflib.php
@@ -339,7 +339,7 @@ class ouwiki_line {
      * @param array $lines Array of ouwiki_line
      * @return array Array of strings
      */
-    function get_as_strings($lines) {
+    static function get_as_strings($lines) {
         $strings=array();
         foreach($lines as $key=>$value) {
             $strings[$key]=$value->get_as_string();        
diff --git a/mod/wiki/edit_form.php b/mod/wiki/edit_form.php
index 5412ee7557a..14278b79e07 100644
--- a/mod/wiki/edit_form.php
+++ b/mod/wiki/edit_form.php
@@ -42,7 +42,6 @@ class mod_wiki_edit_form extends moodleform {
 
         $version = $this->_customdata['version'];
         $format = $this->_customdata['format'];
-        $pagetitle = $this->_customdata['pagetitle'];
 
         if (empty($this->_customdata['contextid'])) {
             // Hack alert
@@ -57,7 +56,7 @@ class mod_wiki_edit_form extends moodleform {
 
         if (isset($this->_customdata['pagetitle'])) {
             // Page title must be formatted properly here as this is output and not an element.
-            $pagetitle = get_string('editingpage', 'wiki', format_string($pagetitle, true, array('context' => get_context_instance_by_id($contextid, MUST_EXIST))));
+            $pagetitle = get_string('editingpage', 'wiki', format_string($this->_customdata['pagetitle'], true, array('context' => get_context_instance_by_id($contextid, MUST_EXIST))));
         } else {
             $pagetitle = get_string('editing', 'wiki');
         }