From: dongsheng <dongsheng>
Date: Wed, 30 Apr 2008 01:47:50 +0000 (+0000)
Subject: "MDL-14262, fix optional_param, and fix link in restorelib.php, merged from MOODLE_19... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=846fb67937c2b48ebcbee576c6e03c132ab999c2;p=moodle.git

"MDL-14262, fix optional_param, and fix link in restorelib.php, merged from MOODLE_19_STABLE"
---

diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index cbee2a96bf..ee7d177ddf 100644
--- a/mod/forum/restorelib.php
+++ b/mod/forum/restorelib.php
@@ -935,7 +935,7 @@
             $mode = substr(strrchr($log->url,"="),1);
             //Get new user id
             if ($use = backup_getid($restore->backup_unique_code, 'user', $log->info)) {
-                $log->url = 'user.php?id=' . $log->course . '&user=' . $use->new_id . '&mode=' . $mode;
+                $log->url = 'user.php?course=' . $log->course . '&id=' . $use->new_id . '&mode=' . $mode;
                 $log->info = $use->new_id;
                 $status = true;
             }
diff --git a/mod/forum/user.php b/mod/forum/user.php
index d247fd29f1..c22818daec 100644
--- a/mod/forum/user.php
+++ b/mod/forum/user.php
@@ -7,7 +7,7 @@
     // Course ID
     $course  = required_param('course', PARAM_INT);
     // User ID
-    $id      = optional_param('id', PARAM_INT);
+    $id      = optional_param('id', 0, PARAM_INT);
     $mode    = optional_param('mode', 'posts', PARAM_ALPHA);
     $page    = optional_param('page', 0, PARAM_INT);
     $perpage = optional_param('perpage', 5, PARAM_INT);