aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-10-24 20:24:44 +0000
committerrvelices <rv-github@modusoptimus.com>2012-10-24 20:24:44 +0000
commit9f24af98f2af9651e6516eeeec4a2cc3a0809c87 (patch)
treeeea1762169d5589f7dbdf22b6eda1016d4daa9c7
parentd9113779376504d0985515c11b8aec2d7de3cd15 (diff)
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/trunk@18732 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/ws_functions.inc.php8
-rw-r--r--tools/ws.htm5
2 files changed, 9 insertions, 4 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'
);
}
diff --git a/tools/ws.htm b/tools/ws.htm
index 88ebe630a..49b1ae7cb 100644
--- a/tools/ws.htm
+++ b/tools/ws.htm
@@ -150,8 +150,7 @@
<h3>Description</h3>
<blockquote>
</blockquote>
-
- <hr>
+ <br>
</div> <!-- methodDescription -->
<div id="methodParams">
@@ -211,7 +210,7 @@
</blockquote>
</div> <!-- testForm -->
- <hr>
+ <br><br>
<h3>Result</h3>
<div id="iframeWrapper">