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
This commit is contained in:
plegall 2010-10-15 20:36:02 +00:00
commit 7ee4f2b076

View file

@ -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;
}