archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merg from trunk to 2.4: small fix on element_url returned from web service calls (now coherent with picture.php)

Browse source 
git-svn-id: http://piwigo.org/svn/branches/2.4@17470 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-08-07 19:55:40 +00:00
parent 2f21acc89c
commit fd64213045
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/ws_functions.inc.php
View file

@ -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