aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-06-07 13:09:17 +0000
committerplegall <plg@piwigo.org>2012-06-07 13:09:17 +0000
commit1e4bc8d5d66d9a8a67c582c87a30bc855dd126a7 (patch)
tree2cecd8bedd0c2fde707ee71ee5b1b70339b72c09 /include
parent3d7971d640da317829f79d06f04ea455152e01be (diff)
merge r15585 from branch 2.3 to trunk
bug 2648 fixed: pwg.categories.getList, avoid to throw an error when representative_picture_id is missing for an album, which makes parsing the JSON output impossible. git-svn-id: http://piwigo.org/svn/trunk@15586 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/ws_functions.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 31cc8662f..0ecd8b930 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -845,7 +845,7 @@ SELECT id, path, representative_ext
{
foreach ($categories as $category)
{
- if ($category['id'] == $cat['id'])
+ if ($category['id'] == $cat['id'] and isset($category['representative_picture_id']))
{
$cat['tn_url'] = $thumbnail_src_of[$category['representative_picture_id']];
}