Changeset 18747

Timestamp:

Oct 25, 2012, 10:01:14 PM (11 years ago)

Author:

rvelices

Message:

related categories on picture page contain status and visible db fields (useful for example for "social" plugins to know if a photo is public or not)

Location:

trunk

Files:

• include/picture_comment.inc.php (modified) (1 diff)
• picture.php (modified) (2 diffs)

trunk/include/picture_comment.inc.php

@@ -32 +32 @@
 foreach ($related_categories as $category)
 {
-  if ($category['commentable'])
+  if ($category['commentable']=='true')
   {
     $page['show_comments'] = true;

trunk/picture.php

@@ -454 +454 @@
 //---------------------------------------------------------- related categories
 $query = '
-SELECT category_id,uppercats,commentable,global_rank
+SELECT id,uppercats,commentable,visible,status,global_rank
   FROM '.IMAGE_CATEGORY_TABLE.'
     INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id
@@ -462 +462 @@
     array
       (
-        'forbidden_categories' => 'category_id',
-        'visible_categories' => 'category_id'
+        'forbidden_categories' => 'id',
+        'visible_categories' => 'id'
       ),
     'AND'
   ).'
 ;';
-$result = pwg_query($query);
-$related_categories = array();
-while ($row = pwg_db_fetch_assoc($result))
-{
-  $row['commentable'] = get_boolean($row['commentable']);
-  array_push($related_categories, $row);
-}
+$related_categories = array_from_query($query);
 usort($related_categories, 'global_rank_compare');
 //-------------------------first, prev, current, next & last picture management