aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-07-15 19:24:17 +0000
committerplegall <plg@piwigo.org>2011-07-15 19:24:17 +0000
commit20c2300aaf90cd2bb561f1a497e8b535dc832f2d (patch)
tree027dc4af6aede76dbf2d2f789bee47044959f40f /include
parentd15d220256f249ad4af1a0bf7d4b95e9e5edd8b1 (diff)
merge r11755 from branch 2.2 to trunk
feature 2243 added: pwg.session.getStatus returns current date (used for images.date_available field, ie database time) git-svn-id: http://piwigo.org/svn/trunk@11756 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/ws_functions.inc.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index b92814688..68e90f81a 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -1722,6 +1722,10 @@ function ws_session_getStatus($params, &$service)
}
$res['pwg_token'] = get_pwg_token();
$res['charset'] = get_pwg_charset();
+
+ list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
+ $res['current_datetime'] = $dbnow;
+
return $res;
}