Merge pull request #852 from catalyst/fix-tempdir-default-39

fix: set the tempdirdefault on the setting itself instead of inside a lang string

Author: danmarsden

lang/en/auth_saml2.php

@@ -186,6 +186,8 @@
 $string['status'] = 'Status';
 $string['suspendeduser'] = 'You have logged in successfully as \'{$a}\' but your account has been suspended in Moodle.';
 $string['taskmetadatarefresh'] = 'Metadata refresh task';
+$string['tempdir'] = 'SimpleSAMLphp temporary directory';
+$string['tempdir_help'] = 'A directory where SimpleSAMLphp can save temporary files';
 $string['test_auth_button_login'] = 'IdP Login';
 $string['test_auth_button_logout'] = 'IdP Logout';
 $string['test_auth_str'] = 'Test isAuthenticated and login';

settings.php

@@ -367,12 +367,12 @@
         1,
         $yesno));
 
-    // SAMLPHP tempdir
+    // SAMLPHP tempdir.
     $settings->add(new admin_setting_configtext(
         'auth_saml2/tempdir',
         get_string('tempdir', 'auth_saml2'),
         get_string('tempdir_help', 'auth_saml2'),
-        get_string('tempdirdefault', 'auth_saml2'),
+        '/tmp/simplesaml',
         PARAM_TEXT,
         50,
         3));