Merged some changes

diff --git a/mod/wiki/lib.php b/mod/wiki/lib.php
index 083818ab71ec354afda09a7998b418b561ff93e4..5871d2db505b68886c801769ea198560e72e97cb 100644 (file)
--- a/mod/wiki/lib.php
+++ b/mod/wiki/lib.php
@@ -775,7 +775,7 @@ function wiki_can_edit_entry(&$wiki_entry, &$wiki, &$user, &$course) {
 
     /// Editing teacher's and admins can edit all wikis, non-editing teachers can edit wikis in their groups, 
     /// or all wikis if group mode is 'no groups' or they don't belong to a group.
-    if (isadmin() or isteacheredit($course->id, $user->id) or
+    if (isadmin($user->id) or isteacheredit($course->id, $user->id) or
         ((!$groupmode or $mygroupid == 0) and isteacher($course->id, $user->id))) {
         $can_edit = true;
     }

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index a05b8ad5625460d48546cfe0ba99e3f33d948a11..465ca74e53cd4f45c42502944b248851478d08f4 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -338,4 +338,4 @@
 
 /// Finish the page
     print_footer($course);
-?>
\ No newline at end of file
+?>