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

diff --git a/mod/forum/restorelib.php b/mod/forum/restorelib.php
index cbee2a96bf96e15955b5fd47594758f7dc936084..ee7d177ddfe495ceae4f92a95ff3b5720a05c00f 100644 (file)
--- 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 d247fd29f17ab01cf9020c97bb6768aea4cca202..c22818daec8d39c1cff9562e2f486ea33633adad 100644 (file)
--- 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);