fixed a bug where userid is overwritten

diff --git a/blog/header.php b/blog/header.php
index f4c30e649688c566dd6eb66c1f0341e6c53e88e5..9de0bb6f819365806a135c9c8f93583aebc5d215 100755 (executable)
--- a/blog/header.php
+++ b/blog/header.php
@@ -12,7 +12,10 @@ $blockaction = optional_param('blockaction','', PARAM_ALPHA);
 $instanceid = optional_param('instanceid', 0, PARAM_INT);
 $blockid = optional_param('blockid',    0, PARAM_INT);
 $groupid = optional_param('groupid',    0, PARAM_INT);
-$userid = optional_param('userid',     0, PARAM_INT);
+
+if (!isset($userid)) {
+    $userid = optional_param('userid',     0, PARAM_INT);
+}
 
 if (!isset($courseid)) {
     $courseid = optional_param('courseid', SITEID, PARAM_INT);

diff --git a/blog/index.php b/blog/index.php
index 5b0b3480434c8781ceae714891f0c176c08c4ef2..a4b754d3f8a4d221c331f636136d875b62cc5229 100755 (executable)
--- a/blog/index.php
+++ b/blog/index.php
@@ -155,7 +155,6 @@ switch ($filtertype) {
     break;
 }
 
-
 //first set the start and end day equal to the day argument passed in from the get vars
 $startday = $d;
 $endday = $d + 1;