Changeset 649743

Timestamp:

01/08/2013 03:18:06 PM (13 years ago)

Author:

jascott

Message:

API term filtering

File:

• kickpress/trunk/kickpress-functions.php (modified) (4 diffs)

kickpress/trunk/kickpress-functions.php

@@ -254 +254 @@
     $defaults['day']   = get_query_var( 'day' );
 
-    /*if ( is_category() ) {
+    if ( is_category() ) {
         $cat = get_category( get_query_var( 'cat' ) );
         $defaults['term']['category'][] = $cat->slug;
@@ -264 +264 @@
         $term     = get_query_var( 'term' );
         $defaults['term'][$taxonomy][] = $term;
-    } */
+    }
 
     extract( wp_parse_args( $args, $defaults ), EXTR_SKIP );
@@ -271 +271 @@
         $post_type = '';
     
+    $single_term = count( $term ) == 1;
+    
+    if ( $single_term ) {
+        $taxonomies = array_keys( $term );
+        $taxonomy = $taxonomies[0];
+        
+        $single_term = count( $term[$taxonomy] ) == 1;
+    }
+    
     if ( 0 < $post_id )
         $base_url = get_permalink( $post_id );
-    elseif ( ! empty( $post_type ) && 'post' != $post_type )
+    elseif ( ! empty( $post_type ) && 'post' != $post_type ) {
         $base_url = get_post_type_archive_link( $post_type );
-    elseif ( is_category() || is_tag() || is_tax() ) {
-        //$tag = $wp_query->query_vars['tag'];
-        //$base_url =  get_term_link($tag, 'post_tag');
-        //echo "<pre>";var_dump(get_pagenum_link());echo("</pre>");
-        $base_url = get_pagenum_link();
-
-    } elseif ( 0 < $year ) {
+        $single_term = false;
+    } elseif ( $single_term )
+        $base_url =  get_term_link($term[$taxonomy][0], $taxonomy);
+    elseif ( 0 < $year ) {
         if ( 0 < $month ) {
             if ( 0 < $day )
@@ -394 +400 @@
     }
     
-    if ( ! empty( $term ) ) {
+    if ( ! empty( $term ) && ! $single_term ) {
         unset( $term['relationship'] );