Merge branch 'MDL-49346-27' of git://github.com/jleyva/moodle into MO…

…ODLE_27_STABLE
moodle · Mar 10, 2015 · 928f68e · 928f68e
2 parents 69067fb + 86b1847
commit 928f68e
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/rating/index.php b/rating/index.php
@@ -29,7 +29,7 @@
 
 $contextid  = required_param('contextid', PARAM_INT);
 $component  = required_param('component', PARAM_COMPONENT);
-$ratingarea = optional_param('ratingarea', null, PARAM_AREA);
+$ratingarea = required_param('ratingarea', PARAM_AREA);
 $itemid     = required_param('itemid', PARAM_INT);
 $scaleid    = required_param('scaleid', PARAM_INT);
 $sort       = optional_param('sort', '', PARAM_ALPHA);
@@ -38,10 +38,12 @@
 list($context, $course, $cm) = get_context_info_array($contextid);
 require_login($course, false, $cm);
 
-$url = new moodle_url('/rating/index.php', array('contextid'=>$contextid,'component'=>$component,'itemid'=>$itemid,'scaleid'=>$scaleid));
-if (!empty($ratingarea)) {
-    $url->param('ratingarea', $ratingarea);
-}
+$url = new moodle_url('/rating/index.php', array('contextid' => $contextid,
+                                                 'component' => $component,
+                                                 'ratingarea' => $ratingarea,
+                                                 'itemid' => $itemid,
+                                                 'scaleid' => $scaleid));
+
 if (!empty($sort)) {
     $url->param('sort', $sort);
 }