Changeset 15586 for trunk

Timestamp:

Jun 7, 2012, 3:09:17 PM (12 years ago)

Author:

plg

Message:

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.

File:

• trunk/include/ws_functions.inc.php (modified) (1 diff)

trunk/include/ws_functions.inc.php

@@ -846 +846 @@
     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']];