From 7ee4f2b076b00227800ffd49d48b0ca9a90db458 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Fri, 15 Oct 2010 20:36:02 +0000
Subject: 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
---
 include/ws_functions.inc.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/ws_functions.inc.php')

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;
 }
-- 
cgit v1.2.3