moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-06-18 12:31:37 +02:00
commit e04a0e32c7
8 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/portfolio/forms.php
View file

@ -199,13 +199,9 @@ final class portfolio_admin_form extends moodleform {
// let the plugin add the fields they want (either statically or not)
if (portfolio_static_function($this->plugin, 'has_admin_config')) {
if (!$this->instance) {
require_once($CFG->libdir . '/portfolio/plugin.php');
require_once($CFG->dirroot . '/portfolio/' . $this->plugin . '/lib.php');
call_user_func(array('portfolio_plugin_' . $this->plugin, 'admin_config_form'), $mform);
} else {
$this->instance->admin_config_form($mform);
}
require_once($CFG->libdir . '/portfolio/plugin.php');
require_once($CFG->dirroot . '/portfolio/' . $this->plugin . '/lib.php');
call_user_func(array('portfolio_plugin_' . $this->plugin, 'admin_config_form'), $mform);
}
// and set the data if we have some.
@ -237,12 +233,7 @@ final class portfolio_admin_form extends moodleform {
}
$pluginerrors = array();
if ($this->instance) {
$pluginerrors = $this->instance->admin_config_validation($data);
}
else {
$pluginerrors = portfolio_static_function($this->plugin, 'admin_config_validation', $data);
}
$pluginerrors = portfolio_static_function($this->plugin, 'admin_config_validation', $data);
if (is_array($pluginerrors)) {
$errors = array_merge($errors, $pluginerrors);
}

4
lib/portfolio/plugin.php
View file

@ -347,7 +347,7 @@ abstract class portfolio_plugin_base {
*
* @param moodleform $mform passed by reference, add elements to it.
*/
public function admin_config_form(&$mform) {}
public static function admin_config_form(&$mform) {}
/**
* Just like the moodle form validation function,
@ -356,7 +356,7 @@ abstract class portfolio_plugin_base {
*
* @param array $data data from form.
*/
public function admin_config_validation($data) {}
public static function admin_config_validation($data) {}
/**
* mform to display to the user exporting data using this plugin.