Merge branch 'MDL-42122' of git://github.com/aolley/moodle

moodle · Oct 8, 2013 · b242214 · b242214
2 parents 944cfe1 + e7dbb03
commit b242214
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
@@ -142,7 +142,7 @@
 $fromformdata['audience'] = optional_param('audience', 'all', PARAM_ALPHANUMEXT);
 $fromformdata['language'] = optional_param('language', current_language(), PARAM_ALPHANUMEXT);
 $fromformdata['educationallevel'] = optional_param('educationallevel', 'all', PARAM_ALPHANUMEXT);
-$fromformdata['downloadable'] = optional_param('downloadable', 1, PARAM_ALPHANUM);
+$fromformdata['downloadable'] = optional_param('downloadable', $usercandownload, PARAM_ALPHANUM);
 $fromformdata['orderby'] = optional_param('orderby', 'newest', PARAM_ALPHA);
 $fromformdata['huburl'] = optional_param('huburl', HUB_MOODLEORGHUBURL, PARAM_URL);
 $fromformdata['search'] = $search;

diff --git a/blocks/community/forms.php b/blocks/community/forms.php
@@ -213,6 +213,7 @@ public function definition() {
             } else {
                 $mform->addElement('hidden', 'downloadable', 0);
             }
+            $mform->setType('downloadable', PARAM_INT);
 
             $options = array();
             $options['all'] = get_string('any');