mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-31193-master' of git://github.com/mouneyrac/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2013-05-08 15:21:47 +08:00
commit 35aba51758
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/adminlib.php
View File

@ -7958,7 +7958,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 = '';

2
webservice/renderer.php
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;