Changeset 355080

Timestamp:

03/04/2011 01:47:03 AM (13 years ago)

Author:

jghazally

Message:

Fix blank the_content for empty product categries

File:

• wp-e-commerce/branches/3.8-development/wpsc-core/wpsc-functions.php (modified) (5 diffs)

wp-e-commerce/branches/3.8-development/wpsc-core/wpsc-functions.php

@@ -418 +418 @@
     $is_404 = false;
     if(isset($wp_query->query_vars['term']) && in_array($wp_query->query_vars['term'], $wpsc_page_titles)){
-        $product_page_id = wpec_get_the_post_id_by_shortcode('[productspage]');
         $wp_query = new WP_Query( 'pagename='.$wpsc_page_titles['products'].'/'.$wp_query->query_vars['term'] );
 
     }elseif ( null == $wpsc_query ) {
-        if($wp_query->is_404 || (isset( $wp_query->query['pagename']) && strpos( $wp_query->query['pagename'] , $wpsc_page_titles['products'] ) !== false ) && !isset($wp_query->post)){
+        if( ( $wp_query->is_404 && !empty($wp_query->query_vars['paged']) ) || (isset( $wp_query->query['pagename']) && strpos( $wp_query->query['pagename'] , $wpsc_page_titles['products'] ) !== false ) && !isset($wp_query->post)){
+            //what was this for?
             global $post;
             $is_404 = true;
@@ -433 +433 @@
                 $wpsc_query_vars['wpsc_product_category'] = $wp_query->query_vars['name'];
         }
-        $products_page = $wpsc_page_titles['products'];
-        $checkout_page = $wpsc_page_titles['checkout'];
-        $userlog_page = $wpsc_page_titles['userlog'];
         if ( count( $wpsc_query_vars ) <= 1 ) {
             $wpsc_query_vars = array(
@@ -501 +498 @@
         
             add_filter( 'pre_get_posts', 'wpsc_generate_product_query', 11 );
-        
+
             $wpsc_query = new WP_Query( $wpsc_query_vars );
             //for 3.1 :| 
             if(empty($wpsc_query->posts) && isset($wpsc_query->tax_query) && isset($wp_query->query_vars['wpsc_product_category'])){
-
                 $wpsc_query_vars = array();
                 $wpsc_query_vars['wpsc_product_category'] = $wp_query->query_vars['wpsc_product_category'];
@@ -515 +511 @@
                 }
                 $wpsc_query = new WP_Query( $wpsc_query_vars );             
+
+
             }
         }
@@ -520 +518 @@
 
     if(  $is_404 || ( ( isset($wpsc_query->post_count) && $wpsc_query->post_count == 0 ) && isset($wpsc_query_vars['wpsc_product_category'] )  )){
+
         $args = array_merge($wp_query->query, array('posts_per_page' => get_option('wpsc_products_per_page')));
         $wp_query = new WP_Query($args);
 
+
+
+
+
     }