aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-10-24 20:26:21 +0000
committerrvelices <rv-github@modusoptimus.com>2012-10-24 20:26:21 +0000
commitfd6c0cc7ba0e5c4a6bd47934dad8dfa9df8f9f69 (patch)
treeffa751cf2d32089b8d27a8165aae447a348601af
parent21c1660ab9b2667b6c7a09891e03804b700aa458 (diff)
merge -r18732 from trunk to branch 2.4 add page_url (canonical picture url) for web service methods images.search, tags.getImages, images.getInfo, categories.getImages
git-svn-id: http://piwigo.org/svn/branches/2.4@18733 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/ws_functions.inc.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index c25ed02ee..1ff56f310 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -148,6 +148,12 @@ function ws_std_get_urls($image_row)
{
$ret = array();
+ $ret['page_url'] = make_picture_url( array(
+ 'image_id' => $image_row['id'],
+ 'image_file' => $image_row['file'],
+ )
+ );
+
$src_image = new SrcImage($image_row);
if ( $src_image->is_original() )
@@ -182,7 +188,7 @@ function ws_std_get_urls($image_row)
function ws_std_get_image_xml_attributes()
{
return array(
- 'id','element_url', 'file','width','height','hit','date_available','date_creation'
+ 'id','element_url', 'page_url', 'file','width','height','hit','date_available','date_creation'
);
}