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

MDL-21235 fixed confirm regression

Browse source
This commit is contained in:
Petr Skoda 2010-01-14 22:44:24 +00:00
parent 574fbea453
commit 4871a238f0
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/outputrenderers.php
View file

@ -985,13 +985,21 @@ class core_renderer extends renderer_base {
* @return string HTML fragment * @return string HTML fragment
*/ */
public function confirm($message, $continue, $cancel) { public function confirm($message, $continue, $cancel) {
if (is_string($continue) or $continue instanceof moodle_url) { if ($continue instanceof single_button) {
$continue = clone($continue);
} else if (is_string($continue)) {
$continue = new single_button(new moodle_url($continue), get_string('continue'), 'post');
} else if ($continue instanceof moodle_url) {
$continue = new single_button($continue, get_string('continue'), 'post'); $continue = new single_button($continue, get_string('continue'), 'post');
} else { } else {
throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a html_form instance.'); throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a html_form instance.');
} }
if (is_string($cancel) or $cancel instanceof moodle_url) { if ($cancel instanceof single_button) {
$cancel = clone($cancel);
} else if (is_string($cancel)) {
$cancel = new single_button(new moodle_url($cancel), get_string('cancel'), 'get');
} else if ($cancel instanceof moodle_url) {
$cancel = new single_button($cancel, get_string('cancel'), 'get'); $cancel = new single_button($cancel, get_string('cancel'), 'get');
} else { } else {
throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a html_form instance.'); throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a html_form instance.');