Changeset 20063

Timestamp:

Jan 11, 2013, 11:41:55 AM (12 years ago)

Author:

mistic100

Message:

[random] only filter forbidden categories/images when we don't specify album id

File:

• extensions/ExtendedDescription/main.inc.php (modified) (1 diff)

extensions/ExtendedDescription/main.inc.php

@@ -516 +516 @@
 SELECT id, category_id
   FROM '.IMAGES_TABLE.'
-    JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
-  WHERE 
-    '.(empty($params['album']) ? '1=1': 'category_id = '.$params['album']);
-    
-  $query.= ' '.get_sql_condition_FandF(array(
-                  'forbidden_categories' => 'category_id',
-                  'visible_categories' => 'category_id',
-                  'visible_images' => 'id'
-                  ),
-                'AND'
-                );
+    JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id';
+  if (empty($params['album']))
+  {
+    $query = '
+  WHERE 1=1 '
+      .get_sql_condition_FandF(array(
+        'forbidden_categories' => 'category_id',
+        'visible_categories' => 'category_id',
+        'visible_images' => 'id'
+        ),
+      'AND'
+      );
+  }
+  else
+  {
+    $query.= '
+  WHERE category_id = '.$params['album'];
+  }
   
   $query.= '