aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2011-05-30 21:32:10 +0000
committerplegall <plg@piwigo.org>2011-05-30 21:32:10 +0000
commit5159af4e099dbff55f99a3857234e1fee9617a50 (patch)
treecad5e6512a8b64314d2d7d535d6cc00b561e3ad2
parentb3dcaf91b477658d4607e5e76b414de906f49690 (diff)
merge r11115 from branch 2.2 to trunk
feature 2244 added: web API methods pwg.categories.getImages, pwg.tags.getImages and pwg.images.search now give the date_creation and date_available for each returned photo. git-svn-id: http://piwigo.org/svn/trunk@11116 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/ws_functions.inc.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 110c7f4c6..a60dfc01e 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -165,7 +165,7 @@ function ws_std_get_urls($image_row)
function ws_std_get_image_xml_attributes()
{
return array(
- 'id','tn_url','element_url','high_url', 'file','width','height','hit'
+ 'id','tn_url','element_url','high_url', 'file','width','height','hit','date_available','date_creation'
);
}
@@ -372,7 +372,7 @@ LIMIT '.(int)$params['per_page'].' OFFSET '.(int)($params['per_page']*$params['p
$image[$k] = (int)$row[$k];
}
}
- foreach ( array('file', 'name', 'comment') as $k )
+ foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}
@@ -931,7 +931,7 @@ SELECT * FROM '.IMAGES_TABLE.'
$image[$k] = (int)$row[$k];
}
}
- foreach ( array('file', 'name', 'comment') as $k )
+ foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}
@@ -1711,7 +1711,7 @@ SELECT * FROM '.IMAGES_TABLE.'
$image[$k] = (int)$row[$k];
}
}
- foreach ( array('file', 'name', 'comment') as $k )
+ foreach ( array('file', 'name', 'comment', 'date_creation', 'date_available') as $k )
{
$image[$k] = $row[$k];
}