diff options
author | plegall <plg@piwigo.org> | 2016-02-03 10:21:36 +0100 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2016-02-03 10:21:36 +0100 |
commit | 6af4590f01c7ea249c6d03b37fb1001ce96b7f4c (patch) | |
tree | 0106bfc992362a6e5e45887b73dc217cd6799b5a /include/ws_functions/pwg.categories.php | |
parent | c4b7977a4272e7e7dedc2adc7d2b2e18867ef27a (diff) |
fixes #410, add param thumbnail_size to pwg.categories.getList
Diffstat (limited to '')
-rw-r--r-- | include/ws_functions/pwg.categories.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/ws_functions/pwg.categories.php b/include/ws_functions/pwg.categories.php index 5bafaf5da..f55a7a773 100644 --- a/include/ws_functions/pwg.categories.php +++ b/include/ws_functions/pwg.categories.php @@ -181,6 +181,11 @@ function ws_categories_getList($params, &$service) { global $user, $conf; + if (!in_array($params['thumbnail_size'], array_keys(ImageStdParams::get_defined_type_map()))) + { + return new PwgError(WS_ERR_INVALID_PARAM, "Invalid thumbnail_size"); + } + $where = array('1=1'); $join_type = 'INNER'; $join_user = $user['id']; @@ -366,7 +371,7 @@ SELECT id, path, representative_ext, level { if ($row['level'] <= $user['level']) { - $thumbnail_src_of[$row['id']] = DerivativeImage::thumb_url($row); + $thumbnail_src_of[$row['id']] = DerivativeImage::url($params['thumbnail_size'], $row); } else { @@ -411,7 +416,7 @@ SELECT id, path, representative_ext while ($row = pwg_db_fetch_assoc($result)) { - $thumbnail_src_of[ $row['id'] ] = DerivativeImage::thumb_url($row); + $thumbnail_src_of[ $row['id'] ] = DerivativeImage::url($params['thumbnail_size'], $row); } } } |