MDL-19756 Corrected an incorrect default text for the "cancel" button of a confirm...

diff --git a/admin/index.php b/admin/index.php
index 1b5be55960baa356d02f7a39cddc6474634df866..b545108317f1b0d5790d948f966624bd2af25d21 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -191,7 +191,10 @@ if ($version > $CFG->version) {  // upgrade
         $continueform = new html_form();
         $continueform->method = 'get';
         $continueform->url = new moodle_url('index.php', array('confirmupgrade' => 1));
-        echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueform, 'index.php');
+        $cancelform = new html_form();
+        $cancelform->url = new moodle_url('index.php');
+        $cancelform->button->text = get_string('no');
+        echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueform, $cancelform);
         echo $OUTPUT->footer();
         exit;
 

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 51b78f0eee74f94a2a341ec9e65d496a8d1bf918..09ef4459636d4ae4e3e25bab8c32ae880e3d5616 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -1114,6 +1114,7 @@ class moodle_core_renderer extends moodle_renderer_base {
             $cancel = $cancelform;
         } else if ($cancel instanceof moodle_url) {
             $cancelform = new html_form();
+            $cancelform->button->text = get_string('cancel');
             $cancelform->url = $cancel;
             $cancel = $cancelform;
         } else {