L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-31193-23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Damyon Wiese
2013-05-08 15:28:24 +08:00
parent 8aa12adcf2 fc9fedb375
commit ce3fa5931d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+1 -1
View File
@@ -7544,7 +7544,7 @@ class admin_setting_managewebservicetokens extends admin_setting {
$validuntil = '';
if (!empty($token->validuntil)) {
$validuntil = date("F j, Y"); //TODO: language support (look for moodle function)
$validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
}
$iprestriction = '';
webservice/renderer.php
+1 -1
View File
@@ -332,7 +332,7 @@ class core_webservice_renderer extends plugin_renderer_base {
$validuntil = '';
if (!empty($token->validuntil)) {
$validuntil = date("F j, Y"); //TODO MDL-31193 language support (look for moodle function)
$validuntil = userdate($token->validuntil, get_string('strftimedatetime', 'langconfig'));
}
$tokenname = $token->name;