MDL-21788 string and setting cleanup of session regen, not needed in head where it...

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 33a6271..f2ee7b4 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -258,7 +258,6 @@ $string['configrcache'] = 'Use the cache to store database records. Remember to
 $string['configrcachettl'] = 'Time-to-live for cached records, in seconds. Use a short (<15) value here.';
 $string['configrecaptchaprivatekey'] = 'String of characters used to communicate between your Moodle server and the recaptcha.net server. Obtain one for this site by visiting http://recaptcha.net';
 $string['configrecaptchapublickey'] = 'String of characters used to display the reCAPTCHA element in the signup form. Generated by http://recaptcha.net';
-$string['configregenloginsession'] = 'Regeneration of the session id during each login request is highly recommended. This setting might not be compatible with some authentication plugins.';
 $string['configrequestedstudentname'] = 'Word for student used in requested courses';
 $string['configrequestedstudentsname'] = 'Word for students used in requested courses';
 $string['configrequestedteachername'] = 'Word for teacher used in requested courses';
@@ -762,7 +761,6 @@ $string['rcache'] = 'Record cache';
 $string['rcachettl'] = 'Record cache TTL';
 $string['recaptchapublickey'] = 'ReCAPTCHA public key';
 $string['recaptchaprivatekey'] = 'ReCAPTCHA private key';
-$string['regenloginsession'] = 'Regenerate session id during login';
 $string['registration'] = 'Registration';
 $string['releasenoteslink'] = 'For information about this version of Moodle, please see the online <a target=\"_blank\" href=\"$a\">Release Notes</a>';
 $string['remotelangnotavailable'] = 'Because Moodle can not connect to download.moodle.org, we are unable to do language pack installation automatically. Please download the appropriate zip file(s) from the list below, copy them to your $a directory and unzip them manually.';

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 5cca86e..1786dab 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3121,6 +3121,12 @@ JOIN {data} d ON d.id=re.dataid';
         upgrade_main_savepoint($result, 2010031800);
     }
 
+    if ($result && $oldversion < 2010031900) {
+        // regeneration of sessions is always enabled, no need for this setting any more
+        unset_config('regenloginsession');
+        upgrade_main_savepoint($result, 2010031900);
+    }
+    
     return $result;
 }