Changeset 1089 for trunk/common

Timestamp:

12/22/09 19:17:47 (2 years ago)

Author:

bogdan2412

Message:

Changed tag_get to return tags consistently with the rest of the code (without tag_ prefix).

Location:

trunk/common

Files:

• db/tags.php (modified) (2 diffs)
• tags.php (modified) (2 diffs)

trunk/common/db/tags.php

@@ -45 +45 @@
     }
     $query = sprintf(
-        "SELECT %s_id, tag_id,
-        tags.name AS tag_name, tags.type AS tag_type, tags.parent AS tag_parent
+        "SELECT %s_id, tag_id AS id,
+        tags.name AS name, tags.type AS type, tags.parent AS parent
         FROM ia_%s_tags AS obj_tags
         LEFT JOIN ia_tags AS tags ON obj_tags.tag_id = tags.id
         WHERE %s_id = %s%s%s
-        ORDER BY tag_name",
+        ORDER BY name",
         db_escape($obj), db_escape($obj), db_escape($obj),
         db_quote($obj_id), $where_type, $where_parent
@@ -104 +104 @@
 function tag_get_by_ids($tag_ids) {
     $query = sprintf(
-            "SELECT `id` AS tag_id, `name` AS tag_name,
-                    `parent` AS tag_parent, `type` AS tag_type
+            "SELECT `id`, `name`, `type`, `parent`
             FROM ia_tags
             WHERE `id` IN (%s)", implode(', ', array_map('db_quote', $tag_ids))

trunk/common/tags.php

@@ -47 +47 @@
     $tag_names = array();
     foreach ($tag_list as $tag) {
-        $tag_names[] = $tag['tag_name'];
+        $tag_names[] = $tag['name'];
     }
     return implode(", ", $tag_names);
@@ -62 +62 @@
     foreach ($parent_tags as $key => $tag) {
         $parent_tags[$key]['sub_tags'] = Array();
-        $parent_tags_key[$tag['tag_id']] = $key;
+        $parent_tags_key[$tag['id']] = $key;
     }
 
     foreach ($sub_tags as $tag) {
-        log_assert(isset($parent_tags_key[$tag['tag_parent']]), "Child tag doesn't have a parent");
-        $parent_tag_key = $parent_tags_key[$tag['tag_parent']];
+        log_assert(isset($parent_tags_key[$tag['parent']]), "Child tag doesn't have a parent");
+        $parent_tag_key = $parent_tags_key[$tag['parent']];
         $parent_tags[$parent_tag_key]['sub_tags'][] = $tag;
     }