MDL-17094 Automatic language update can be disabled via $CFG->skiplangupgrade setting...

diff --git a/admin/langimport.php b/admin/langimport.php
index 02b57d3b60616ab50d00ad5ff7d90cfeb3251a18..319b9fe0bcb88ba1d6499be4a934e3a7051b05e6 100755 (executable)
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -11,6 +11,13 @@
 
     admin_externalpage_setup('langimport');
 
+    if (!empty($CFG->skiplangupgrade)) {
+        admin_externalpage_print_header();
+        print_box(get_string('langimportdisabled', 'admin'));
+        print_footer();
+        die;
+    }
+
     $mode          = optional_param('mode', 0, PARAM_INT);     //phase
     $pack          = optional_param('pack', array(), PARAM_FILE);   //pack to install
     $displaylang   = $pack;

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 97773c339ffb19b9b7a2adf6c5361aa1432fa274..a6e3bc67dc2e5db3ea95f1a269ebbeb4a3ba05b0 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -461,6 +461,7 @@ $string['langmasterpackage'] = 'Master language pack';
 $string['langmasterenglish'] = 'Master English pack';
 $string['langlocalpackage'] = 'Local modifications';
 $string['langimport'] = 'Language import utility';
+$string['langimportdisabled'] = 'Language import feature has been disabled. You have to update your language packs manually at the file-system level.';
 $string['langimportsuccess'] = 'Language pack successfully upgraded';
 $string['langlist'] = 'Languages on language menu';
 $string['langmenu'] = 'Display language menu';