Changeset 738579

Timestamp:

07/10/2013 06:56:42 AM (13 years ago)

Author:

garyc40

Message:

Sync with github

Location:

wp-e-commerce/branches/branch-3.8.12

Files:

• .gitignore (modified) (1 diff)
• readme.md (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wp-shopping-cart.php (modified) (1 diff)
• wpsc-admin/display-items.page.php (modified) (1 diff)
• wpsc-core/wpsc-constants.php (modified) (1 diff)

wp-e-commerce/branches/branch-3.8.12/.gitignore

@@ -1 @@
-.idea
+cookbooks
+tmp

wp-e-commerce/branches/branch-3.8.12/readme.md

@@ -16 +16 @@
 -------------------------
 
-* The latest stable version is [3.8.12](http://wordpress.org/extend/plugins/wp-e-commerce).
+* The latest stable version is [3.8.12.1](http://wordpress.org/extend/plugins/wp-e-commerce).
 * Active development version: 3.8.13-dev (branch [master](https://github.com/wp-e-commerce/WP-e-Commerce))
 * [Roadmap for 3.8.13](https://github.com/wp-e-commerce/wp-e-commerce/wiki/Roadmap)

wp-e-commerce/branches/branch-3.8.12/readme.txt

@@ -5 +5 @@
 Requires at least: 3.4
 Tested up to: 3.6
-Stable tag: 3.8.12
+Stable tag: 3.8.12.1
 
 WP e-Commerce is a free WordPress Shopping Cart Plugin that lets customers buy your products, services and digital downloads online.
@@ -146 +146 @@
 
 == Changelog ==
+
+= 3.8.12.1 =
+* Fix: Fatal error in wpsc_product_list_exclude_child_categories() due to other themes
+       or plugins calling get_posts() before the main query is set up
 
 = 3.8.12 =

wp-e-commerce/branches/branch-3.8.12/wp-shopping-cart.php

@@ -4 +4 @@
   * Plugin URI: http://getshopped.org/
   * Description: A plugin that provides a WordPress Shopping Cart. See also: <a href="http://getshopped.org" target="_blank">GetShopped.org</a> | <a href="http://getshopped.org/forums/" target="_blank">Support Forum</a> | <a href="http://docs.getshopped.org/" target="_blank">Documentation</a>
-  * Version: 3.8.12
+  * Version: 3.8.12.1
   * Author: Instinct Entertainment
   * Author URI: http://getshopped.org/

wp-e-commerce/branches/branch-3.8.12/wpsc-admin/display-items.page.php

@@ -488 +488 @@
 function wpsc_product_list_exclude_child_categories( $query ) {
 
-    if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) )
+    if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || ! $query->is_main_query() )
         return;
 

wp-e-commerce/branches/branch-3.8.12/wpsc-core/wpsc-constants.php

@@ -29 +29 @@
         define( 'WPSC_URL',       plugins_url( '', __FILE__ ) );
     // Define Plugin version
-    define( 'WPSC_VERSION', '3.8.12' );
+    define( 'WPSC_VERSION', '3.8.12.1' );
     define( 'WPSC_MINOR_VERSION', '55f8cfa0d7' );
-    define( 'WPSC_PRESENTABLE_VERSION', '3.8.12' );
+    define( 'WPSC_PRESENTABLE_VERSION', '3.8.12.1' );
     define( 'WPSC_DB_VERSION', 4 );