mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 04:22:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-31763 mod_data: Fixed array iteration reference issue

Browse Source
This commit is contained in:
Sam Hemelryk 2012-05-10 17:31:24 +12:00
parent 83c9d449e0
commit c56d266a58
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mod/data/lang/en/data.php
View File

@ -54,6 +54,7 @@ $string['cancel'] = 'Cancel';
$string['cannotaccesspresentsother'] = 'You are not allowed to access presets from other users';
$string['cannotadd'] = 'Can not add entries!';
$string['cannotdeletepreset'] = 'Error deleting a preset!';
$string['cannotoverwritepreset'] = 'Error overwriting preset';
$string['cannotunziptopreset'] = 'Cannot unzip to the preset directory';
$string['columns'] = 'columns';
$string['comment'] = 'Comment';

16
mod/data/preset.php
View File

@ -78,6 +78,9 @@ foreach ($presets as &$preset) {
$preset->description .= html_writer::link($delurl, $delicon);
}
}
// This is required because its currently bound to the last element in the array.
// If someone were to inadvently use it again and this call were not here
unset($preset);
$form_importexisting = new data_existing_preset_form(null, array('presets'=>$presets));
$form_importexisting->set_data(array('d' => $data->id));
@ -145,12 +148,15 @@ if (optional_param('sesskey', false, PARAM_BOOL) && confirm_sesskey()) {
foreach ($presets as $preset) {
if ($preset->name == $formdata->name) {
$selectedpreset = $preset;
break;
}
}
if (data_user_can_delete_preset($context, $selectedpreset)) {
data_delete_site_preset($formdata->name);
} else {
print_error('cannotdeletepreset', 'data');
if (isset($selectedpreset->name)) {
if (data_user_can_delete_preset($context, $selectedpreset)) {
data_delete_site_preset($formdata->name);
} else {
print_error('cannotoverwritepreset', 'data');
}
}
}
@ -199,7 +205,7 @@ if (optional_param('sesskey', false, PARAM_BOOL) && confirm_sesskey()) {
$selectedpreset = $preset;
}
}
if (!data_user_can_delete_preset($context, $selectedpreset)) {
if (!isset($selectedpreset->shortname) || !data_user_can_delete_preset($context, $selectedpreset)) {
print_error('invalidrequest');
}