Changeset 8323

Timestamp:

03/17/2007 01:28:26 AM (19 years ago)

Author:

majelbstoat

Message:

• Make sure get_categories filter still respects the hierarchy. Padded counts will be wrong, but we can live with that for now.

File:

• gengo/trunk/gengo/gengo.php (modified) (3 diffs)

gengo/trunk/gengo/gengo.php

@@ -651 +651 @@
 
     // Called from wp_list_categories.
-    function get_categories($categories, $arguments) {
-      global $wpdb;
+function get_categories($categories, $arguments) {
+  global $wpdb;
 
         if (('post' != $arguments['type']) || !$categories) return $categories;
@@ -660 +660 @@
         }
         $category_ids = implode(',', $category_ids);
+
         $viewable_codes = explode(GENGO_LANGUAGE_DIVIDER, $this->viewable_code_string);
         foreach ($viewable_codes as $viewable_code) $ids[] = $this->codes2ids[$viewable_code];
         $language_ids = implode(',', $ids);
         if ($language_ids) {
-            $categories = $wpdb->get_results("SELECT c.*, COUNT(DISTINCT (CASE WHEN translation_group > 0 THEN -translation_group ELSE p2l.post_id END)) as category_count FROM $this->post2lang_table p2l INNER JOIN $wpdb->post2cat p2c ON p2c.post_id = p2l.post_id INNER JOIN $wpdb->posts p ON p2l.post_id = p.ID INNER JOIN $wpdb->categories AS c ON p2c.category_id = c.cat_ID WHERE p2l.language_id IN ($language_ids) AND p2c.category_id IN ($category_ids) AND p.post_type = 'post' AND p.post_status = 'publish' GROUP BY c.cat_ID $sort_column $sort_order");
+            $counted_categories = $wpdb->get_results("SELECT c.cat_ID, p.post_type, COUNT(DISTINCT (CASE WHEN translation_group > 0 THEN -translation_group ELSE p2l.post_id END)) as category_count FROM $this->post2lang_table p2l INNER JOIN $wpdb->post2cat p2c ON p2c.post_id = p2l.post_id INNER JOIN $wpdb->posts p ON p2l.post_id = p.ID INNER JOIN $wpdb->categories AS c ON p2c.category_id = c.cat_ID WHERE p2l.language_id IN ($language_ids) AND p2c.category_id IN ($category_ids) AND p.post_status = 'publish' GROUP BY c.cat_ID, p.post_type $sort_column $sort_order");
+
+            foreach ($counted_categories as $counted_category) {
+              $hashed_counts[$counted_category->post_type][$counted_category->cat_ID] = $counted_category->category_count;
+            }
+            $post_types = array_keys($hashed_counts);
+
+            foreach ($categories as $cat) {
+                foreach ($post_types as $post_type) {
+                    $count_slot = ('post' == $post_type) ? 'category_count' : 'category_' . $post_type . 'count';
+                    $cat->$count_slot = $hashed_counts[$post_type][$cat->cat_ID];
+                }
+            }
+
+            if ($arguments['hide_empty'] || $arguments['pad_counts']) {
+                $protected = -1;
+              $pad = array();
+              $keys = array_reverse(array_keys($categories));
+              foreach ($keys as $k) {
+                    $cat = $categories[$k];
+                    if ($cat->category_count || ($cat->cat_ID == $protected)) {
+                        if ($arguments['hierarchical']) {
+                            $protected = $cat->category_parent;
+                        }
+                        if ($arguments['pad_counts']) {
+                            // Known bug: if a post belongs to a category and its parent, counted twice. Not worth the trouble.
+                            $cat->category_count += $pad[$cat->cat_ID];
+                    if ($cat->category_parent) {
+                                $pad[$cat->category_parent] += $cat->category_count;
+                            }
+                  }
+                } elseif ($arguments['hide_empty']) {
+                        unset($categories[$k]);
+                }
+              }
+            }
         }
         return $categories;
-    }
+}
 
     function post_comments_feed_link($url) {
@@ -1922 +1958 @@
 /*
 
-Fatal error get_currentuserinfo()
-categories from MAP.
-in_category().
-
 0.91:
 -----
 
+
+
 autochange the spellchecker if possible...
 move the caching into the_posts()