MDL-21818 fixed globals problems

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 1f69de4..fae5ed4 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -9,7 +9,7 @@
     #require_once("$CFG->dirroot/course/lib.php"); // For side-blocks
     $PAGE->requires->yui2_lib('connection');
 
-    $ewiki_action = optional_param('ewiki_action', '', PARAM_ALPHA);     // Action on Wiki-Page
+    $ewiki_action = null; // this is a bloody global which is set up elsewhere
     $id           = optional_param('id', 0, PARAM_INT);                  // Course Module ID, or
     $wid          = optional_param('wid', 0, PARAM_INT);                 // Wiki ID
     $page         = optional_param('page', false);                       // Wiki Page Name
@@ -283,9 +283,15 @@
                "view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title",
                format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid);
     } else if ($ewiki_action != 'edit') {
-        add_to_log($course->id, "wiki", $ewiki_action,
-               "view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title",
-               format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid);
+        if (!in_array($ewiki_action, array('view', 'links', 'info'))) {
+            add_to_log($course->id, "wiki", 'bogus',
+                   "view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title",
+                   format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid);
+        } else {
+            add_to_log($course->id, "wiki", $ewiki_action,
+                   "view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title",
+                   format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid);
+        }
     }