WP eCommerce - Version 3.8.13.3

Version Description

  • Fix: Users disappear in Network Admin -> Users page (for multisite)
  • Fix: User counts are incorrect when there are thousands separators.
  • Fix: "Save Product Files" button doesn't like being clicked on.
Download this release

Release Info

Developer garyc40
Plugin Icon 128x128 WP eCommerce
Version 3.8.13.3
Comparing to
See all releases

Code changes from version 3.8.13.2 to 3.8.13.3

Files changed (5) hide show
  1. readme.txt +7 -1
  2. wp-shopping-cart.php +1 -1
  3. wpsc-admin/css/admin.css +7 -6
  4. wpsc-core/wpsc-constants.php +3 -3
  5. wpsc-includes/customer.php +11 -5
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://getshopped.org
4
  Tags: e-commerce, wp-e-commerce, shop, cart, paypal, authorize, stock control, ecommerce, shipping, tax
5
  Requires at least: 3.7
6
  Tested up to: 3.8
7
- Stable tag: 3.8.13.2
8
 
9
  WP e-Commerce is a free WordPress Shopping Cart Plugin that lets customers buy your products, services and digital downloads online.
10
 
@@ -146,6 +146,12 @@ After upgrading from earlier versions look for link "Update Store". This will up
146
 
147
  == Changelog ==
148
 
 
 
 
 
 
 
149
  = 3.8.13.2 =
150
  * Fix: Anonymous customers should not be visible in admin UI.
151
  * Fix: Cronjob to purge anonymous customers doesn't work due to memory issues.
4
  Tags: e-commerce, wp-e-commerce, shop, cart, paypal, authorize, stock control, ecommerce, shipping, tax
5
  Requires at least: 3.7
6
  Tested up to: 3.8
7
+ Stable tag: 3.8.13.3
8
 
9
  WP e-Commerce is a free WordPress Shopping Cart Plugin that lets customers buy your products, services and digital downloads online.
10
 
146
 
147
  == Changelog ==
148
 
149
+ = 3.8.13.3 =
150
+ * Fix: Users disappear in Network Admin -> Users page (for multisite)
151
+ * Fix: User counts are incorrect when there are thousands separators.
152
+ * Fix: "Save Product Files" button doesn't like being clicked on.
153
+
154
+
155
  = 3.8.13.2 =
156
  * Fix: Anonymous customers should not be visible in admin UI.
157
  * Fix: Cronjob to purge anonymous customers doesn't work due to memory issues.
wp-shopping-cart.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: WP e-Commerce
4
  * Plugin URI: http://getshopped.org/
5
  * 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>
6
- * Version: 3.8.13.2
7
  * Author: Instinct Entertainment
8
  * Author URI: http://getshopped.org/
9
  **/
3
  * Plugin Name: WP e-Commerce
4
  * Plugin URI: http://getshopped.org/
5
  * 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>
6
+ * Version: 3.8.13.3
7
  * Author: Instinct Entertainment
8
  * Author URI: http://getshopped.org/
9
  **/
wpsc-admin/css/admin.css CHANGED
@@ -846,12 +846,13 @@ div#side-sortables input[type="file"] {
846
  }
847
  .select_product_file,
848
  .edit_select_product_file {
849
- margin-bottom:0;
850
- margin-top:3px;
851
- overflow-x:hidden;
852
- overflow-y:auto;
853
- position:relative;
854
- }
 
855
 
856
  span.select_product_note {
857
  margin: 0 0 5px;
846
  }
847
  .select_product_file,
848
  .edit_select_product_file {
849
+ margin-bottom: 0;
850
+ margin-top: 3px;
851
+ overflow-x: hidden;
852
+ overflow-y: auto;
853
+ position: relative;
854
+ width: 100%;
855
+ }
856
 
857
  span.select_product_note {
858
  margin: 0 0 5px;
wpsc-core/wpsc-constants.php CHANGED
@@ -29,9 +29,9 @@ function wpsc_core_constants() {
29
  define( 'WPSC_URL', plugins_url( '', __FILE__ ) );
30
 
31
  // Define Plugin version
32
- define( 'WPSC_VERSION' , '3.8.13.2' );
33
- define( 'WPSC_MINOR_VERSION' , 'b0ef2e3' );
34
- define( 'WPSC_PRESENTABLE_VERSION', '3.8.13.2' );
35
  define( 'WPSC_DB_VERSION' , 8 );
36
 
37
  // Define Debug Variables for developers
29
  define( 'WPSC_URL', plugins_url( '', __FILE__ ) );
30
 
31
  // Define Plugin version
32
+ define( 'WPSC_VERSION' , '3.8.13.3' );
33
+ define( 'WPSC_MINOR_VERSION' , '5ec5b4d' );
34
+ define( 'WPSC_PRESENTABLE_VERSION', '3.8.13.3' );
35
  define( 'WPSC_DB_VERSION' , 8 );
36
 
37
  // Define Debug Variables for developers
wpsc-includes/customer.php CHANGED
@@ -563,8 +563,9 @@ function _wpsc_is_bot_user() {
563
  * @return int
564
  */
565
  function _wpsc_extract_user_count( $view ) {
566
- if ( preg_match( '/class="count">\((\d+)\)/', $view, $matches ) ) {
567
- return absint( $matches[1] );
 
568
  }
569
 
570
  return 0;
@@ -586,7 +587,7 @@ function _wpsc_filter_views_users( $views ) {
586
  $anon_count = _wpsc_extract_user_count( $views['wpsc_anonymous'] );
587
  $all_count = _wpsc_extract_user_count( $views['all'] );
588
  $new_count = $all_count - $anon_count;
589
- $views['all'] = str_replace( "(${all_count})", "(${new_count})", $views['all'] );
590
  }
591
 
592
  unset( $views['wpsc_anonymous'] );
@@ -617,9 +618,14 @@ function _wpsc_action_pre_user_query( $query ) {
617
  if ( ! empty( $query->query_vars['role'] ) )
618
  return;
619
 
620
- // if the site is multisite, a JOIN is already done
621
  if ( is_multisite() ) {
622
- $query->query_where .= " AND CAST($wpdb->usermeta.meta_value AS CHAR) NOT LIKE '%" . like_escape( '"wpsc_anonymous"' ) . "%'";
 
 
 
 
 
623
  return;
624
  }
625
 
563
  * @return int
564
  */
565
  function _wpsc_extract_user_count( $view ) {
566
+ global $wp_locale;
567
+ if ( preg_match( '/class="count">\((.+)\)/', $view, $matches ) ) {
568
+ return absint( str_replace( $wp_locale->number_format['thousands_sep'], '', $matches[1] ) );
569
  }
570
 
571
  return 0;
587
  $anon_count = _wpsc_extract_user_count( $views['wpsc_anonymous'] );
588
  $all_count = _wpsc_extract_user_count( $views['all'] );
589
  $new_count = $all_count - $anon_count;
590
+ $views['all'] = preg_replace( '/class="count">\(.+\)/', 'class="count">(' . number_format_i18n( $new_count ) . ')', $views['all'] );
591
  }
592
 
593
  unset( $views['wpsc_anonymous'] );
618
  if ( ! empty( $query->query_vars['role'] ) )
619
  return;
620
 
621
+ // if the site is multisite, we need to do things a bit differently
622
  if ( is_multisite() ) {
623
+ // on Network Admin, a JOIN with usermeta is not possible (some users don't have capabilities set, so we fall back to matching user_login, although this is not ideal)
624
+ if ( empty( $query->query_vars['blog_id'] ) ) {
625
+ $query->query_where .= " AND $wpdb->users.user_login NOT LIKE '\_________'";
626
+ } else {
627
+ $query->query_where .= " AND CAST($wpdb->usermeta.meta_value AS CHAR) NOT LIKE '%" . like_escape( '"wpsc_anonymous"' ) . "%'";
628
+ }
629
  return;
630
  }
631