MDL-19756 Fixed incorrectly thrown exception in output->confirm()

diff --git a/lib/outputlib.php b/lib/outputlib.php
index c098cd9a264f808662a9d60090993f57e9d3e39c..16335feaee72a057d60d3c0dd1b8bbfc4911586d 100644 (file)
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -2402,14 +2402,16 @@ class moodle_core_renderer extends moodle_renderer_base {
             $continueform = new html_form();
             $continueform->url = new moodle_url($continue);
             $continue = $continueform;
-        } else {
-            throw new coding_exception('The 2nd and 3rd params to $OUTPUT->confirm must be either a URL (string/moodle_url) or a html_form object.');
+        } else if (!is_object($continue)) {
+            throw new coding_exception('The 2nd param to $OUTPUT->confirm must be either a URL (string/moodle_url) or a html_form object.');
         }
 
         if (!($cancel instanceof html_form) && !is_object($cancel)) {
             $cancelform = new html_form();
             $cancelform->url = new moodle_url($cancel);
             $cancel = $cancelform;
+        } else if (!is_object($cancel)) {
+            throw new coding_exception('The 3rd param to $OUTPUT->confirm must be either a URL (string/moodle_url) or a html_form object.');
         }
 
         if (empty($continue->button->label)) {