From 1e4bc8d5d66d9a8a67c582c87a30bc855dd126a7 Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 7 Jun 2012 13:09:17 +0000 Subject: [PATCH] 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 --- include/ws_functions.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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']]; }