moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
mod/assignment/lib.php
View file

@ -2473,7 +2473,7 @@ function assignment_delete_instance($id){
function assignment_update_instance($assignment){
global $CFG;
$assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_SAFEDIR);
$assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_PLUGIN);
require_once("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
$assignmentclass = "assignment_$assignment->assignmenttype";
@ -2490,7 +2490,7 @@ function assignment_update_instance($assignment){
function assignment_add_instance($assignment) {
global $CFG;
$assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_SAFEDIR);
$assignment->assignmenttype = clean_param($assignment->assignmenttype, PARAM_PLUGIN);
require_once("$CFG->dirroot/mod/assignment/type/$assignment->assignmenttype/assignment.class.php");
$assignmentclass = "assignment_$assignment->assignmenttype";

2
mod/lesson/locallib.php
View file

@ -723,7 +723,7 @@ abstract class lesson_add_page_form_base extends moodleform {
if ($this->standard === true) {
$mform->addElement('hidden', 'qtype');
$mform->setType('qtype', PARAM_SAFEDIR);
$mform->setType('qtype', PARAM_PLUGIN);
$mform->addElement('text', 'title', get_string('pagetitle', 'lesson'), array('size'=>70));
$mform->setType('title', PARAM_TEXT);

2
mod/workshop/form/assessment_form.php
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'));

2
mod/workshop/form/edit_form.php
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);