aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-12-13 15:21:36 +0000
committerplegall <plg@piwigo.org>2011-12-13 15:21:36 +0000
commit5bdba6b0bc7a18c49f3b28555bc9cef0943ed679 (patch)
tree1914531895650c54d4a13cad6d7e76f61913a30b
parentb129ee5c13ce3a24906725f6a2adccd3d8a254c6 (diff)
merge r12729 from branch 2.3 to trunk
feature 2489 added: ability to update "file" info in pwg.images.setInfo git-svn-id: http://piwigo.org/svn/trunk@12730 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/ws_functions.inc.php1
-rw-r--r--ws.php1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index e1967bcbb..7d1c6431a 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -2427,6 +2427,7 @@ SELECT *
$update = array();
$info_columns = array(
+ 'file',
'name',
'author',
'comment',
diff --git a/ws.php b/ws.php
index c7781093b..4319bada9 100644
--- a/ws.php
+++ b/ws.php
@@ -376,6 +376,7 @@ function ws_addDefaultMethods( $arr )
array(
'image_id' => array(),
+ 'file' => array('default' => null),
'name' => array('default' => null),
'author' => array('default' => null),
'date_creation' => array('default' => null),