MDL-21198 one more single_button + version bump to the new year (could not resit it)

diff --git a/admin/index.php b/admin/index.php
index 1fe7be1d1c5c854db4ea0dab60035161fbfcf2ff..8d2e0d30ea9bfc4540ef1b68f2b5c9a510cc6ad3 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -200,13 +200,9 @@ if ($version > $CFG->version) {  // upgrade
         $PAGE->set_heading($stradministration);
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
-        $continueform = new html_form();
-        $continueform->method = 'get';
-        $continueform->url = new moodle_url('index.php', array('confirmupgrade' => 1));
-        $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);
+        $continueurl = new moodle_url('index.php', array('confirmupgrade' => 1));
+        $cancelurl = new moodle_url('index.php');
+        echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueurl, $cancelurl);
         echo $OUTPUT->footer();
         exit;
 

diff --git a/version.php b/version.php
index 578bd6dc172ea1aa1cc7bec30e38b37646ef9d6f..6a010e4d4d5e4be7c08ba5e1d73817f3bbd2dfa4 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2009123000;  // YYYYMMDD   = date of the last version bump
+    $version = 2010010300;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20100103)';  // Human-friendly version name