mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 12:19:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0a4470beea into 122cbf7567

Browse source
This commit is contained in:
Damien Sorel 2025-04-10 10:13:13 +02:00 • committed by GitHub
commit 3dda6c95e1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ws_functions/pwg.categories.php
View file

@ -133,7 +133,7 @@ SELECT SQL_CALC_FOUND_ROWS i.*
} }
$image = array_merge($image, ws_std_get_urls($row)); $image = array_merge($image, ws_std_get_urls($row));
$images[] = $image; $images[] = trigger_change('ws_getImages_details', $image, $row, $params);
} }
list($total_images) = pwg_db_fetch_row(pwg_query('SELECT FOUND_ROWS()')); list($total_images) = pwg_db_fetch_row(pwg_query('SELECT FOUND_ROWS()'));

4
include/ws_functions/pwg.images.php
View file

@ -575,6 +575,8 @@ SELECT id, date, author, content
array('id','date') array('id','date')
); );
$ret = trigger_change('ws_images_getInfo', $ret);
if ($service->_responseFormat != 'rest') if ($service->_responseFormat != 'rest')
{ {
return $ret; // for backward compatibility only return $ret; // for backward compatibility only
@ -693,7 +695,7 @@ SELECT *
} }
$image = array_merge($image, ws_std_get_urls($row)); $image = array_merge($image, ws_std_get_urls($row));
$images[ $image_ids[ $image['id'] ] ] = $image; $images[ $image_ids[ $image['id'] ] ] = trigger_change('ws_getImages_details', $image, $row, $params);
} }
ksort($images, SORT_NUMERIC); ksort($images, SORT_NUMERIC);
$images = array_values($images); $images = array_values($images);

2
include/ws_functions/pwg.tags.php
View file

@ -188,7 +188,7 @@ SELECT *
} }
$image['tags'] = new PwgNamedArray($image_tags, 'tag', ws_std_get_tag_xml_attributes() ); $image['tags'] = new PwgNamedArray($image_tags, 'tag', ws_std_get_tag_xml_attributes() );
$images[] = $image; $images[] = trigger_change('ws_getImages_details', $image, $row, $params);
} }
usort($images, 'rank_compare'); usort($images, 'rank_compare');

24
tools/triggers_list.php
View file

@ -718,7 +718,7 @@ array(
'name' => 'render_category_description', 'name' => 'render_category_description',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('string', 'category_description', 'string', 'action'), 'vars' => array('string', 'category_description', 'string', 'action'),
'files' => array('include\category_cats.inc.php', 'include\section_init.inc.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList)'), 'files' => array('include\category_cats.inc.php', 'include\section_init.inc.php', 'include\ws_functions\pwg.categories.php (ws_categories_getList, ws_categories_getAdminList)'),
), ),
array( array(
'name' => 'render_category_literal_description', 'name' => 'render_category_literal_description',
@ -730,7 +730,7 @@ array(
'name' => 'render_category_name', 'name' => 'render_category_name',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('string', 'category_name', 'string', 'location'), 'vars' => array('string', 'category_name', 'string', 'location'),
'files' => array('admin\cat_list.php', 'include\ws_functions.inc.php (ws_categories_getList, ws_categories_getAdminList, ws_categories_move)'), 'files' => array('admin\cat_list.php', 'include\ws_functions\pwg.categories.php (ws_categories_getList, ws_categories_getAdminList, ws_categories_move)'),
), ),
array( array(
'name' => 'render_comment_author', 'name' => 'render_comment_author',
@ -920,9 +920,27 @@ array(
'name' => 'ws_users_getList', 'name' => 'ws_users_getList',
'type' => 'trigger_change', 'type' => 'trigger_change',
'vars' => array('array', 'users'), 'vars' => array('array', 'users'),
'files' => array('include\ws_functions\pwg.users.php'), 'files' => array('include\ws_functions\pwg.users.php (ws_users_getList)'),
'infos' => 'New in 2.6.2.', 'infos' => 'New in 2.6.2.',
), ),
array(
'name' => 'ws_images_getInfo',
'type' => 'trigger_change',
'vars' => array('object', 'image'),
'files' => array('include\ws_functions\pwg.images.php (ws_images_getInfo)'),
'infos' => 'New in 15.',
),
array(
'name' => 'ws_getImages_details',
'type' => 'trigger_change',
'vars' => array('object', 'image', 'object', 'db_row', 'object', 'params'),
'files' => array(
'include\ws_functions\pwg.categories.php (ws_categories_getImages)',
'include\ws_functions\pwg.images.php (ws_images_search)',
'include\ws_functions\pwg.tags.php (ws_tags_getImages)',
),
'infos' => 'New in 15. Allows to expose more fields in images lists WebServices.<br><strong>WARNING:</strong> called for each image, avoid doing expensive tasks in the handler.',
),
); );
?> ?>
<!DOCTYPE html> <!DOCTYPE html>