Index: index.php
===================================================================
RCS file: /cvsroot/moodle/moodle/admin/index.php,v
retrieving revision 1.286.2.23
diff -u -r1.286.2.23 index.php
--- index.php	21 Aug 2008 15:31:10 -0000	1.286.2.23
+++ index.php	31 Oct 2008 20:39:59 -0000
@@ -287,16 +287,20 @@
                 require_once($CFG->libdir.'/environmentlib.php');
                 print_heading(get_string('environment', 'admin'));
                 if (!check_moodle_environment($release, $environment_results, true)) {
-                    print_box_start('generalbox', 'notice'); // MDL-8330
-                    print_string('langpackwillbeupdated', 'admin');
-                    print_box_end();
+                    if (empty($CFG->skiplangupgrade)) { // MDL-17094
+                        print_box_start('generalbox', 'notice'); // MDL-8330
+                        print_string('langpackwillbeupdated', 'admin');
+                        print_box_end();
+                    }
                     notice_yesno(get_string('environmenterrorupgrade', 'admin'),
                                  'index.php?confirmupgrade=1&confirmrelease=1', 'index.php');
                 } else {
                     notify(get_string('environmentok', 'admin'), 'notifysuccess');
-                    print_box_start('generalbox', 'notice'); // MDL-8330
-                    print_string('langpackwillbeupdated', 'admin');
-                    print_box_end();
+                    if (empty($CFG->skiplangupgrade)) { // MDL-17094
+                        print_box_start('generalbox', 'notice'); // MDL-8330
+                        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" />';
@@ -344,7 +348,9 @@
                 upgrade_log_start();
 
             /// Upgrade current language pack if we can
-                upgrade_language_pack();
+                if (empty($CFG->skiplangupgrade)) { // MDL-17094
+                    upgrade_language_pack();
+                }
 
                 print_heading($strdatabasechecking);
                 $db->debug=true;