Merge branch 'MDL-27525' of git://github.com/rwijaya/moodle

mod/wiki/edit.php

@@ -45,7 +45,7 @@ $version = optional_param('version', -1, PARAM_INT);
 $attachments = optional_param('attachments', 0, PARAM_INT);
 $deleteuploads = optional_param('deleteuploads', 0, PARAM_RAW);
 
-$newconent = '';
+$newcontent = '';
 if (!empty($newcontent) && is_array($newcontent)) {
     $newcontent = $newcontent['text'];
 }

mod/wiki/pagelib.php

@@ -1913,7 +1913,7 @@ class page_wiki_save extends page_wiki_edit {
 
         if ($this->format != 'html') {
             $params['fileitemid'] = $this->page->id;
-            $params['contextid']  = $context->id;
+            $params['contextid']  = $this->modcontext->id;
             $params['component']  = 'mod_wiki';
             $params['filearea']   = 'attachments';
         }