diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index 1029ba221a3..b5149000797 100644
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -57,7 +57,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
 
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');
diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index 79f74e31c8b..71c232ad06b 100644
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -66,7 +66,7 @@ if ($compare >= $comparewith) {
     print_error('cannotcomparenewerversion', 'wiki');
 }
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');
diff --git a/mod/wiki/files.php b/mod/wiki/files.php
index 6ba9c6aba01..3bcfed478c4 100644
--- a/mod/wiki/files.php
+++ b/mod/wiki/files.php
@@ -77,7 +77,7 @@ $context = context_module::instance($cm->id);
 
 
 $PAGE->set_url('/mod/wiki/files.php', array('pageid'=>$pageid));
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewfiles', 'wiki');
diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index d6f869782db..8ef5f6a112e 100644
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -58,7 +58,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
 
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');
diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index 1a4951a30f1..63657e45c2b 100644
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -53,7 +53,7 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');
diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index 8317ccb36bc..a43090d838a 100644
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -84,7 +84,7 @@ abstract class page_wiki {
      */
     protected $tabs_options = array();
     /**
-     * @var object wiki renderer
+     * @var mod_wiki_renderer wiki renderer
      */
     protected $wikioutput;
     /**
diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index be8ecd3ee32..7efc27b4be0 100644
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -51,7 +51,7 @@ if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index d5e669b3c5f..2406c031571 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -70,7 +70,7 @@ if ($id) {
     // Checking course instance
     $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-    require_login($course, true, $cm);
+    require_course_login($course, true, $cm);
 
     // Checking wiki instance
     if (!$wiki = wiki_get_wiki($cm->instance)) {
@@ -142,7 +142,7 @@ if ($id) {
     // Checking course instance
     $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-    require_login($course, true, $cm);
+    require_course_login($course, true, $cm);
     /*
      * Case 2:
      *
@@ -173,7 +173,7 @@ if ($id) {
     // Checking course instance
     $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-    require_login($course, true, $cm);
+    require_course_login($course, true, $cm);
 
     $groupmode = groups_get_activity_groupmode($cm);
 
diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index d034ef0d623..6c622a105a1 100644
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -58,7 +58,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
 
 $course = $DB->get_record('course', array('id' => $cm->course), '*', MUST_EXIST);
 
-require_login($course, true, $cm);
+require_course_login($course, true, $cm);
 
 if (!wiki_user_can_view($subwiki, $wiki)) {
     print_error('cannotviewpage', 'wiki');