Merge branch 'hotfix/1.10.4' into stable

WordPoints · Apr 13, 2015 · 9d3ede1 · 9d3ede1
2 parents bf2837b + 70d6535
commit 9d3ede1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/src/components/points/admin/admin.php b/src/components/points/admin/admin.php
@@ -328,20 +328,17 @@ function wordpoints_points_profile_options( $user ) {
 
 		<h3><?php echo esc_html( $heading ); ?></h3>
 
-		<?php
-
-		foreach ( wordpoints_get_points_types() as $slug => $type ) {
+		<table>
+			<tbody>
+				<?php foreach ( wordpoints_get_points_types() as $slug => $type ) : ?>
+					<tr>
+						<th scope="row" style="text-align: left;"><?php echo esc_html( $type['name'] ); ?></th>
+						<td style="text-align: right;"><?php wordpoints_display_points( $user->ID, $slug, 'profile_page' ); ?></td>
+					</tr>
+				<?php endforeach; ?>
+			</tbody>
 
-			echo esc_html( $type['name'] ) . ': ';
-
-			wordpoints_display_points(
-				wordpoints_get_points( $user->ID, $slug )
-				, $slug
-				, 'profile_page'
-			);
-
-			echo '<br />';
-		}
+		<?php
 	}
 }
 add_action( 'personal_options', 'wordpoints_points_profile_options', 20 );

diff --git a/src/includes/constants.php b/src/includes/constants.php
@@ -16,7 +16,7 @@
  *
  * @const WORDPOINTS_VERSION
  */
-define( 'WORDPOINTS_VERSION', '1.10.3' );
+define( 'WORDPOINTS_VERSION', '1.10.4' );
 
 /**
  * The full path to the plugin's main directory.

diff --git a/src/readme.txt b/src/readme.txt
@@ -3,8 +3,8 @@ Contributors: jdgrimes
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=TPXS6B98HURLJ&lc=US&item_name=WordPoints&item_number=wordpressorg&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_LG%2egif%3aNonHosted
 Tags: points, awards, rewards, cubepoints, credits, gamify, multisite, ranks
 Requires at least: 3.9
-Tested up to: 4.2-beta3-31903
-Stable tag: 1.10.3
+Tested up to: 4.2-beta4-32085
+Stable tag: 1.10.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -122,6 +122,10 @@ manage the ranks used on your site.
 5. An example of the `[wordpoints_how_to_get_points]` shortcode.
 
 == Changelog ==
+= 1.10.4 — (~2 hrs) =
+* Fixed: Users would see 0 instead of the correct number of points on the profile
+admin screen.
+
 = 1.10.3 - (~10 hrs) =
 * Fixed: Closes 2 potential SQL injection vulnerabilities in the points logs query
 code. These are not exploitable within WordPoints itself, however, it is possible
@@ -292,6 +296,10 @@ choosing the points type to add it to.
 * Initial release
 
 == Upgrade Notice ==
+= 1.10.4 =
+* Fixes a bug that caused the number of points a non-admin user has to always be
+displayed to them as 0 on the profile screen.
+
 = 1.10.3 =
 * This is a security-fix release that addresses three security-related issues. One
 vulnerability is not exploitable by default, and the other two issues only occur on

diff --git a/src/wordpoints.php b/src/wordpoints.php
@@ -4,7 +4,7 @@
  * Plugin Name: WordPoints
  * Plugin URI: http://wordpoints.org/
  * Description: Create one or more points systems for your site, and reward user activity.
- * Version: 1.10.3
+ * Version: 1.10.4
  * Author: J.D. Grimes
  * Author URI: http://codesymphony.co/
  * License: GPLv2
@@ -40,7 +40,7 @@
  *
  * @package WordPoints
  * @author J.D. Grimes <jdg@codesymphony.co>
- * @version 1.10.3
+ * @version 1.10.4
  * @license http://opensource.org/licenses/gpl-license.php GPL, version 2 or later.
  * @copyright 2013-2015 J.D. Grimes
  */