L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-16134 - fixing regression introduced by conversion to exceptions

Browse Source
This commit is contained in:
mjollnir_
2008-08-20 09:11:20 +00:00
parent ff5328a279
commit f240dc7036
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/portfoliolib.php
+9 -2
View File
@@ -1287,13 +1287,20 @@ abstract class portfolio_plugin_base {
if (!portfolio_static_function($plugin, 'allows_multiple')) {
// check we don't have one already
if ($DB->record_exists('portfolio_instance', array('plugin' => $plugin))) {
throw new portfolio_exception('multipledisallowed', 'portfolio', $plugin);
throw new portfolio_exception('multipledisallowed', 'portfolio', '', $plugin);
}
}
$newid = $DB->insert_record('portfolio_instance', $new);
require_once($CFG->dirroot . '/portfolio/type/' . $plugin . '/lib.php');
$classname = 'portfolio_plugin_' . $plugin;
$obj = new $classname($newid);
// the form contains extra hidden fields used by the controller and stuff
// unset them here to avoid an exception
foreach ((array)$config as $key => $value) {
if (!in_array($key, $obj->get_allowed_config())) {
unset($config->{$key});
}
}
$obj->set_config($config);
return $obj;
}
@@ -1507,7 +1514,7 @@ abstract class portfolio_plugin_base {
return true;
}
$a = (object)array('property' => $field, 'class' => get_class($this));
throw new portfolio_export_exception($this->get('exporter'), 'invalidproperty', 'portfolio', $a);
throw new portfolio_export_exception($this->get('exporter'), 'invalidproperty', 'portfolio', '', $a);
}