Skip to content

Commit

Permalink
Merge branch 'hotfix-2.3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
valendesigns committed Mar 11, 2014
2 parents 8a62297 + 650b1a4 commit 5bcde00
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
8 changes: 4 additions & 4 deletions assets/js/ot-admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,16 +327,16 @@

switch ( condition.rule ) {
case 'less_than':
result = ( v1 < v2 );
result = ( parseInt( v1 ) < parseInt( v2 ) );
break;
case 'less_than_or_equal_to':
result = ( v1 <= v2 );
result = ( parseInt( v1 ) <= parseInt( v2 ) );
break;
case 'greater_than':
result = ( v1 > v2 );
result = ( parseInt( v1 ) > parseInt( v2 ) );
break;
case 'greater_than_or_equal_to':
result = ( v1 >= v2 );
result = ( parseInt( v1 ) >= parseInt( v2 ) );
break;
case 'contains':
result = ( v2.indexOf(v1) !== -1 ? true : false );
Expand Down
2 changes: 1 addition & 1 deletion includes/ot-functions-option-types.php
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ function ot_type_measurement( $args = array() ) {
* @access public
* @since 2.1
*/
if( ! function_exists( 'ot_type_numeric_slider' ) ) {
if ( ! function_exists( 'ot_type_numeric_slider' ) ) {

function ot_type_numeric_slider( $args = array() ) {

Expand Down
4 changes: 2 additions & 2 deletions ot-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: OptionTree
* Plugin URI: http://wp.envato.com
* Description: Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
* Version: 2.3.3
* Version: 2.3.4
* Author: Derek Herman
* Author URI: http://valendesigns.com
* License: GPLv3
Expand Down Expand Up @@ -142,7 +142,7 @@ private function constants() {
/**
* Current Version number.
*/
define( 'OT_VERSION', '2.3.3' );
define( 'OT_VERSION', '2.3.4' );

/**
* For developers: Theme mode.
Expand Down
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: http://bit.ly/NuXI3T
Tags: options, theme options, meta boxes
Requires at least: 3.5
Tested up to: 3.8.1
Stable tag: 2.3.3
Stable tag: 2.3.4
License: GPLv3

Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
Expand Down Expand Up @@ -106,6 +106,9 @@ There sure is, and I'm glad you asked. Download and activate the [OptionTree The

== Changelog ==

= 2.3.4 =
* Hotfix - Fixed an issue where condition number values were being treated like strings and not returning a correct boolean response.

= 2.3.3 =
* Hotfix - Fixed subfolder compatibility with versions of Windows that use backslashes instead of forward slashes. Contributors via github @primozcigler and @valendesigns.
* Hotfix - Fixed missing text domain in demo files. Contributors via github @jetonr.
Expand Down

0 comments on commit 5bcde00

Please sign in to comment.