Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-09-27 00:00:20 +02:00
commit e135797586
50 changed files with 267 additions and 142 deletions

View file

@ -63,7 +63,7 @@ class workshop_assessment_form extends moodleform {
// add the data common for all subplugins
$mform->addElement('hidden', 'strategy', $this->workshop->strategy);
$mform->setType('strategy', PARAM_SAFEDIR);
$mform->setType('strategy', PARAM_PLUGIN);
if (!empty($this->options['editableweight']) and !$mform->isFrozen()) {
$mform->addElement('header', 'assessmentsettings', get_string('assessmentweight', 'workshop'));

View file

@ -63,7 +63,7 @@ class workshop_edit_strategy_form extends moodleform {
$mform->setType('workshopid', PARAM_INT);
$mform->addElement('hidden', 'strategy', $this->workshop->strategy); // strategy name
$mform->setType('strategy', PARAM_SAFEDIR);
$mform->setType('strategy', PARAM_PLUGIN);
$this->definition_inner($mform);