Skip to content

Commit

Permalink
Merge pull request #499 from alicolville/10.2.5
Browse files Browse the repository at this point in the history
10.2.5
  • Loading branch information
alicolville authored Sep 8, 2022
2 parents f02ae21 + cf43260 commit d98efae
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion assets/css/libraries/tabs.min.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion pro-features/footable.php
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ function ws_ls_datatable_rows( $arguments ) {
} elseif( false === empty( $previous_user_weight[ $entry[ 'user_id' ] ] ) ) {

if ( false === empty( $entry[ 'kg' ] ) ) {

$row[ 'previous-weight' ] = $previous_user_weight[ $entry[ 'user_id' ] ];

if ( $entry['kg'] > $previous_user_weight[ $entry[ 'user_id' ] ] ) {
Expand Down Expand Up @@ -305,7 +306,7 @@ function ws_ls_datatable_rows_localise( $row ) {

global $ws_ls_request_from_admin_screen;

if ( false === empty( $row[ 'previous-weight-diff' ] ) ) {
if ( false === empty( $row[ 'value' ][ 'previous-weight-diff' ] ) ) {
$row[ 'value' ][ 'gainloss' ][ 'value' ] = ws_ls_blur_text( ws_ls_weight_display( $row[ 'value' ][ 'previous-weight-diff' ], NULL, 'display', $ws_ls_request_from_admin_screen, true ) );
}

Expand Down
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: aliakro
Tags: weight,tracker,chart,bmi,bmr,macronutrient,measure,awards,custom fields,history,measurements,data
Requires at least: 5.7
Tested up to: 6.0.2
Stable tag: 10.2.4
Stable tag: 10.2.5
Requires PHP: 7.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -150,6 +150,11 @@ Measurements are created using Custom Fields. You can therefore specify the unit

== Changelog ==

= 10.2.5 =

* Bug fix: In a table, show comparison data between weights.
* Bug fix: Corrected fix in 10.2.3 and put the correct image path in the CSS file!

= 10.2.4 =

* Bug fix: Hide custom fields when editing an entry if "hide-custom-fields" specified on [wt-beta]. https://github.com/alicolville/Weight-Tracker/issues/492
Expand Down
4 changes: 2 additions & 2 deletions weight-loss-tracker.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/**
* Plugin Name: Weight Tracker
* Description: Allow your users to track their weight, body measurements, photos and other pieces of custom data. Display in charts, tables, shortcodes and widgets. Manage their data, issue awards, email notifications, etc! Provide advanced data on Body Mass Index (BMI), Basal Metabolic Rate (BMR), Calorie intake, Harris Benedict Formula, Macronutrients Calculator and more.
* Version: 10.2.4
* Version: 10.2.5
* Requires at least: 5.7
* Tested up to: 6.0.2
* Requires PHP: 7.2
Expand All @@ -18,7 +18,7 @@
*/

define( 'WS_LS_ABSPATH', plugin_dir_path( __FILE__ ) );
define( 'WE_LS_CURRENT_VERSION', '10.2.4' );
define( 'WE_LS_CURRENT_VERSION', '10.2.5' );
define( 'WE_LS_TITLE', 'Weight Tracker' );
define( 'WE_LS_SLUG', 'weight-loss-tracker' );
define( 'WE_LS_LICENSE_TYPES_URL', 'https://docs.yeken.uk/features.html' );
Expand Down

0 comments on commit d98efae

Please sign in to comment.