diff --git a/mod/wiki/locallib.php b/mod/wiki/locallib.php
index cbb844231df..6507f936089 100644
--- a/mod/wiki/locallib.php
+++ b/mod/wiki/locallib.php
@@ -704,20 +704,20 @@ function wiki_user_can_view($subwiki) {
             // There is one wiki for all the class.
             //
             // Only view capbility needed
-            return has_capability('mod/wiki:viewpage', $context, $USER);
+            return has_capability('mod/wiki:viewpage', $context);
         } else if ($wiki->wikimode == 'individual') {
             // Individual Mode:
             // Each person owns a wiki.
             if ($subwiki->userid == $USER->id) {
                 // Only the owner of the wiki can view it
-                return has_capability('mod/wiki:viewpage', $context, $USER);
+                return has_capability('mod/wiki:viewpage', $context);
             } else { // User has special capabilities
                 // User must have:
                 //      mod/wiki:viewpage capability
                 // and
                 //      mod/wiki:managewiki capability
-                $view = has_capability('mod/wiki:viewpage', $context, $USER);
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
+                $view = has_capability('mod/wiki:viewpage', $context);
+                $manage = has_capability('mod/wiki:managewiki', $context);
 
                 return $view && $manage;
             }
@@ -736,7 +736,7 @@ function wiki_user_can_view($subwiki) {
             // Only members of subwiki group could view that wiki
             if ($subwiki->groupid == groups_get_activity_group($cm)) {
                 // Only view capability needed
-                return has_capability('mod/wiki:viewpage', $context, $USER);
+                return has_capability('mod/wiki:viewpage', $context);
 
             } else { // User is not part of that group
                 // User must have:
@@ -745,9 +745,9 @@ function wiki_user_can_view($subwiki) {
                 //      moodle/site:accessallgroups capability
                 // and
                 //      mod/wiki:viewpage capability
-                $view = has_capability('mod/wiki:viewpage', $context, $USER);
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
-                $access = has_capability('moodle/site:accessallgroups', $context, $USER);
+                $view = has_capability('mod/wiki:viewpage', $context);
+                $manage = has_capability('mod/wiki:managewiki', $context);
+                $access = has_capability('moodle/site:accessallgroups', $context);
                 return ($manage || $access) && $view;
             }
         } else {
@@ -765,7 +765,7 @@ function wiki_user_can_view($subwiki) {
             // Everybody can read all wikis
             //
             // Only view capability needed
-            return has_capability('mod/wiki:viewpage', $context, $USER);
+            return has_capability('mod/wiki:viewpage', $context);
         } else {
             //Error
             return false;
@@ -796,22 +796,22 @@ function wiki_user_can_edit($subwiki) {
             // There is a wiki for all the class.
             //
             // Only edit capbility needed
-            return has_capability('mod/wiki:editpage', $context, $USER);
+            return has_capability('mod/wiki:editpage', $context);
         } else if ($wiki->wikimode == 'individual') {
             // Individual Mode
             // There is a wiki per user
 
             // Only the owner of that wiki can edit it
             if ($subwiki->userid == $USER->id) {
-                return has_capability('mod/wiki:editpage', $context, $USER);
+                return has_capability('mod/wiki:editpage', $context);
             } else { // Current user is not the owner of that wiki.
 
                 // User must have:
                 //      mod/wiki:editpage capability
                 // and
                 //      mod/wiki:managewiki capability
-                $edit = has_capability('mod/wiki:editpage', $context, $USER);
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
+                $edit = has_capability('mod/wiki:editpage', $context);
+                $manage = has_capability('mod/wiki:managewiki', $context);
 
                 return $edit && $manage;
             }
@@ -827,7 +827,7 @@ function wiki_user_can_edit($subwiki) {
             // Only members of subwiki group could edit that wiki
             if ($subwiki->groupid == groups_get_activity_group($cm)) {
                 // Only edit capability needed
-                return has_capability('mod/wiki:editpage', $context, $USER);
+                return has_capability('mod/wiki:editpage', $context);
             } else { // User is not part of that group
                 // User must have:
                 //      mod/wiki:managewiki capability
@@ -835,9 +835,9 @@ function wiki_user_can_edit($subwiki) {
                 //      moodle/site:accessallgroups capability
                 // and
                 //      mod/wiki:editpage capability
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
-                $access = has_capability('moodle/site:accessallgroups', $context, $USER);
-                $edit = has_capability('mod/wiki:editpage', $context, $USER);
+                $manage = has_capability('mod/wiki:managewiki', $context);
+                $access = has_capability('moodle/site:accessallgroups', $context);
+                $edit = has_capability('mod/wiki:editpage', $context);
                 return $manage && $access && $edit;
             }
         } else if ($wiki->wikimode == 'individual') {
@@ -846,7 +846,7 @@ function wiki_user_can_edit($subwiki) {
             //
             // Only the owner of that wiki can edit it
             if ($subwiki->userid == $USER->id) {
-                return has_capability('mod/wiki:editpage', $context, $USER);
+                return has_capability('mod/wiki:editpage', $context);
             } else { // Current user is not the owner of that wiki.
                 // User must have:
                 //      mod/wiki:managewiki capability
@@ -854,9 +854,9 @@ function wiki_user_can_edit($subwiki) {
                 //      moodle/site:accessallgroups capability
                 // and
                 //      mod/wiki:editpage capability
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
-                $access = has_capability('moodle/site:accessallgroups', $context, $USER);
-                $edit = has_capability('mod/wiki:editpage', $context, $USER);
+                $manage = has_capability('mod/wiki:managewiki', $context);
+                $access = has_capability('moodle/site:accessallgroups', $context);
+                $edit = has_capability('mod/wiki:editpage', $context);
                 return $manage && $access && $edit;
             }
         } else {
@@ -871,14 +871,14 @@ function wiki_user_can_edit($subwiki) {
             // Only members of subwiki group could edit that wiki
             if ($subwiki->groupid == groups_get_activity_group($cm)) {
                 // Only edit capability needed
-                return has_capability('mod/wiki:editpage', $context, $USER);
+                return has_capability('mod/wiki:editpage', $context);
             } else { // User is not part of that group
                 // User must have:
                 //      mod/wiki:managewiki capability
                 // and
                 //      mod/wiki:editpage capability
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
-                $edit = has_capability('mod/wiki:editpage', $context, $USER);
+                $manage = has_capability('mod/wiki:managewiki', $context);
+                $edit = has_capability('mod/wiki:editpage', $context);
                 return $manage && $edit;
             }
         } else if ($wiki->wikimode == 'individual') {
@@ -887,14 +887,14 @@ function wiki_user_can_edit($subwiki) {
             //
             // Only the owner of that wiki can edit it
             if ($subwiki->userid == $USER->id) {
-                return has_capability('mod/wiki:editpage', $context, $USER);
+                return has_capability('mod/wiki:editpage', $context);
             } else { // Current user is not the owner of that wiki.
                 // User must have:
                 //      mod/wiki:managewiki capability
                 // and
                 //      mod/wiki:editpage capability
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
-                $edit = has_capability('mod/wiki:editpage', $context, $USER);
+                $manage = has_capability('mod/wiki:managewiki', $context);
+                $edit = has_capability('mod/wiki:editpage', $context);
                 return $manage && $edit;
             }
         } else {
diff --git a/mod/wiki/renderer.php b/mod/wiki/renderer.php
index 03f668903cb..b8197dec2d9 100644
--- a/mod/wiki/renderer.php
+++ b/mod/wiki/renderer.php
@@ -303,8 +303,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
             } else if ($wiki->wikimode == 'individual') {
                 // We have private wikis here
 
-                $view = has_capability('mod/wiki:viewpage', $context, $USER);
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
+                $view = has_capability('mod/wiki:viewpage', $context);
+                $manage = has_capability('mod/wiki:managewiki', $context);
 
                 // Only people with these capabilities can view all wikis
                 if ($view && $manage) {
@@ -340,8 +340,8 @@ class mod_wiki_renderer extends plugin_renderer_base {
                 return;
             } else if ($wiki->wikimode == 'individual') {
                 //  @TODO: Print here a combo that contains all users of that subwiki.
-                $view = has_capability('mod/wiki:viewpage', $context, $USER);
-                $manage = has_capability('mod/wiki:managewiki', $context, $USER);
+                $view = has_capability('mod/wiki:viewpage', $context);
+                $manage = has_capability('mod/wiki:managewiki', $context);
 
                 // Only people with these capabilities can view all wikis
                 if ($view && $manage) {
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 5e7193c0ff9..decf651f57a 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -248,7 +248,7 @@ if ($id) {
     //     *
     //     * Error. No more options
     //     */
-    } else {
+} else {
     print_error('incorrectparameters');
 }
 require_course_login($course, true, $cm);