diff options
| author | plegall <plg@piwigo.org> | 2010-10-15 20:36:02 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-10-15 20:36:02 +0000 |
| commit | 7ee4f2b076b00227800ffd49d48b0ca9a90db458 (patch) | |
| tree | 437d69098c835152b4fd6ec7870ebf0316863749 /include/ws_functions.inc.php | |
| parent | 2e27457fb3d9f8ccc882f4d736b406eae4b002c3 (diff) | |
merge r7210 from branch 2.1 to trunk
feature 1756 added: returns the security token in method pwg.session.getStatus
git-svn-id: http://piwigo.org/svn/trunk@7212 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/ws_functions.inc.php')
| -rw-r--r-- | include/ws_functions.inc.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php index d0b44b0be..ec9227d49 100644 --- a/include/ws_functions.inc.php +++ b/include/ws_functions.inc.php @@ -1360,6 +1360,7 @@ function ws_session_getStatus($params, &$service) { $res[$k] = $user[$k]; } + $res['pwg_token'] = get_pwg_token(); $res['charset'] = get_pwg_charset(); return $res; } |