aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-08-07 19:55:40 +0000
committerrvelices <rv-github@modusoptimus.com>2012-08-07 19:55:40 +0000
commitfd64213045d72dc409180cd7901b4f667e777969 (patch)
tree88c41b1e1a6a98744f10e9770b3cbb1b53da0721
parent2f21acc89cc0cd9a0819920a29396b9a60cd978f (diff)
merg from trunk to 2.4: small fix on element_url returned from web service calls (now coherent with picture.php)
git-svn-id: http://piwigo.org/svn/branches/2.4@17470 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/ws_functions.inc.php15
1 files changed, 9 insertions, 6 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index cf6796d9d..4e9d8d3fb 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -150,8 +150,15 @@ function ws_std_get_urls($image_row)
$src_image = new SrcImage($image_row);
- global $user;
- if ($user['enabled_high'])
+ if ( $src_image->is_original() )
+ {// we have a photo
+ global $user;
+ if ($user['enabled_high'])
+ {
+ $ret['element_url'] = $src_image->get_url();
+ }
+ }
+ else
{
$ret['element_url'] = get_element_url($image_row);
}
@@ -389,7 +396,6 @@ SELECT id
*/
function ws_categories_getImages($params, &$service)
{
- @include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
global $user, $conf;
$images = array();
@@ -1026,7 +1032,6 @@ SELECT DISTINCT image_id
*/
function ws_images_getInfo($params, &$service)
{
- @include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
global $user, $conf;
$params['image_id'] = (int)$params['image_id'];
if ( $params['image_id']<=0 )
@@ -1252,7 +1257,6 @@ function ws_images_search($params, &$service)
global $page;
$images = array();
include_once( PHPWG_ROOT_PATH .'include/functions_search.inc.php' );
- include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
$where_clauses = ws_std_image_sql_filter( $params, 'i.' );
$order_by = ws_std_image_sql_order($params, 'i.');
@@ -2171,7 +2175,6 @@ function ws_tags_getAdminList($params, &$service)
*/
function ws_tags_getImages($params, &$service)
{
- @include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
global $conf;
// first build all the tag_ids we are interested in