MDL-21818 fixed globals problems

This commit is contained in:
Petr Skoda 2010-03-18 20:59:58 +00:00
parent 794eed327d
commit 8db38eab80

View file

@ -9,7 +9,7 @@
#require_once("$CFG->dirroot/course/lib.php"); // For side-blocks #require_once("$CFG->dirroot/course/lib.php"); // For side-blocks
$PAGE->requires->yui2_lib('connection'); $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 $id = optional_param('id', 0, PARAM_INT); // Course Module ID, or
$wid = optional_param('wid', 0, PARAM_INT); // Wiki ID $wid = optional_param('wid', 0, PARAM_INT); // Wiki ID
$page = optional_param('page', false); // Wiki Page Name $page = optional_param('page', false); // Wiki Page Name
@ -283,9 +283,15 @@
"view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title", "view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title",
format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid); format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid);
} else if ($ewiki_action != 'edit') { } else if ($ewiki_action != 'edit') {
add_to_log($course->id, "wiki", $ewiki_action, if (!in_array($ewiki_action, array('view', 'links', 'info'))) {
"view.php?id=$cm->id&groupid=$groupid&userid=$userid&page=$ewiki_title", add_to_log($course->id, "wiki", 'bogus',
format_string($wiki->name,true).": ".$ewiki_title, $cm->id, $userid); "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);
}
} }