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

This commit is contained in:
Damyon Wiese
2013-10-08 12:49:07 +08:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -142,7 +142,7 @@ $fromformdata['subject'] = optional_param('subject', 'all', PARAM_ALPHANUMEXT);
$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;
+1
View File
@@ -213,6 +213,7 @@ class community_hub_search_form extends moodleform {
} else {
$mform->addElement('hidden', 'downloadable', 0);
}
$mform->setType('downloadable', PARAM_INT);
$options = array();
$options['all'] = get_string('any');