MDL-17458 fixed some buttons and upgrade strings

diff --git a/admin/index.php b/admin/index.php
index 8c02f468f43a6d04385701f9d0ce97e39859ad66..9157049c095d5187e26add9771a2069692d6c221 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -241,13 +241,7 @@
                     print_string('langpackwillbeupdated', 'admin');
                     print_box_end();
                 }
-                echo '<form action="index.php"><div>';
-                echo '<input type="hidden" name="confirmupgrade" value="1" />';
-                echo '<input type="hidden" name="confirmrelease" value="1" />';
-                echo '</div>';
-                echo '<div class="continuebutton">';
-                echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-                echo '</form>';
+                print_continue('index.php?confirmupgrade=1&confirmrelease=1');
             }
 
             print_footer('none');
@@ -266,13 +260,7 @@
             echo '<div class="continuebutton">';
             print_single_button('index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1), get_string('reload'), 'get');
             echo '</div><br />';
-            echo '<form action="index.php"><div>';
-            echo '<input type="hidden" name="confirmupgrade" value="1" />';
-            echo '<input type="hidden" name="confirmrelease" value="1" />';
-            echo '<input type="hidden" name="confirmplugincheck" value="1" />';
-            echo '</div>';
-            echo '<br /><br /><input type="submit" value="'.get_string('continue').'" /></div>';
-            echo '</form>';
+            print_continue('index.php?confirmupgrade=1&confirmrelease=1&confirmplugincheck=1');
             print_footer('none');
             die();
 

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 38087191a15f7e181f8124db137d2f592c8d9c42..25c2c126160296feb9f1b0e073e3570ca65430e1 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -805,6 +805,7 @@ Are you sure you want to upgrade this server to this version?';
 $string['upgradetimedout'] = 'Upgrade timed out, please restart the upgrade.';
 $string['upgradingdata'] = 'Upgrading data';
 $string['upgradinglogs'] = 'Upgrading logs';
+$string['upgradingversion'] = 'Upgrading to new version';
 $string['uploaduserspreview'] = 'Upload users preview';
 $string['uploadusersresult'] = 'Upload users results';
 $string['upwards'] = 'upwards';

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 753d2ae733b895ce2cc5dc5ea57ea818be94e780..2afc2e1b002f0b887754d23b72c84ccd992659dd 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -866,7 +866,7 @@ function upgrade_log_start($preinstall=false) {
 
     } else {
         if (!CLI_SCRIPT and !defined('HEADER_PRINTED')) {
-            $strupgrade  = get_string('upgrade');
+            $strupgrade  = get_string('upgradingversion', 'admin');
 
             print_header($strupgrade, $strupgrade,
                 build_navigation(array(array('name' => $strupgrade, 'link' => null, 'type' => 'misc'))), '',

diff --git a/version.php b/version.php
index b4eb427db55018ca3f50b25b72681a6280759be4..a9c0d019f176a03b8b0c82c2a8db3adf8e2a874c 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 = 2009011101;  // YYYYMMDD   = date of the last version bump
+    $version = 2009011301;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090113)';  // Human-friendly version name