Changeset 2410

Timestamp:

Jul 1, 2008, 4:10:13 AM (16 years ago)

Author:

rvelices

Message:

• tags improvement : pass to templates all fields in table #tags (handy for plugins such as type tags)

Location:

branches/branch-1_7

Files:

• include/functions_tag.inc.php (modified) (3 diffs)
• tags.php (modified) (1 diff)

branches/branch-1_7/include/functions_tag.inc.php

@@ -41 +41 @@
   // we can find top fatter tags among reachable images
   $tags_query = '
-SELECT id, name, url_name, count(*) counter
+SELECT t.*, count(*) counter
   FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id';
+    INNER JOIN '.TAGS_TABLE.' t ON tag_id = id';
 
   $where_tag_img =
@@ -102 +102 @@
 {
   $query = '
-SELECT id,
-       name,
-       url_name
+SELECT *
   FROM '.TAGS_TABLE.'
 ;';
@@ -246 +244 @@
   }
   $query = '
-SELECT id, name, url_name, count(*) counter
+SELECT t.*, count(*) counter
   FROM '.IMAGE_TAG_TABLE.'
-    INNER JOIN '.TAGS_TABLE.' ON tag_id = id
+    INNER JOIN '.TAGS_TABLE.' t ON tag_id = id
   WHERE image_id IN ('.implode(',', $items).')';
   if (!empty($excluded_tag_ids))

branches/branch-1_7/tags.php

@@ -92 +92 @@
   $template->assign_block_vars(
     'tag',
-    array(
-      'URL' => make_index_url(
-        array(
-          'tags' => array($tag),
-          )
-        ),
+    array_merge(
+      $tag,
+      array(
+        'URL' => make_index_url(
+          array(
+            'tags' => array($tag),
+            )
+          ),
 
-      'NAME' => $tag['name'],
-      'TITLE' => $tag['counter'],
-      'CLASS' => 'tagLevel'.$tag['level'],
+        'NAME' => $tag['name'],
+        'TITLE' => $tag['counter'],
+        'CLASS' => 'tagLevel'.$tag['level'],
+        )
       )
     );