Fix for templates trial and prepare for version push.

Author: dovy

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "reduxframework/redux-framework-4",
-	"version": "4.1.17",
+	"version": "4.1.18",
 	"authors": [
 		{
 			"name": "Redux.io",

package.json

@@ -3,7 +3,7 @@
 	"main": "gulpfile.js",
 	"name": "redux",
 	"author": "Redux.io + Dōvy Paukstys",
-	"version": "4.1.17",
+	"version": "4.1.18",
 	"license": "GPL-3.0-or-later",
 	"repository": {
 		"type": "git",

readme.txt

@@ -5,7 +5,7 @@ Tags: gutenberg, blocks, gutenberg blocks, editor, block, page builder, block ed
 Requires at least: 4.0
 Requires PHP: 5.3
 Tested up to: 5.5
-Stable tag: 4.1.17
+Stable tag: 4.1.18
 License: GPL-2.0+
 License URI: http://www.gnu.org/licenses/gpl-2.0.txt
 

redux-core/framework.php

@@ -23,7 +23,7 @@
 
 require_once dirname( __FILE__ ) . '/class-redux-core.php';
 
-Redux_Core::$version    = '4.1.17';
+Redux_Core::$version    = '4.1.18';
 Redux_Core::$redux_path = dirname( __FILE__ );
 Redux_Core::instance();
 

redux-framework.php

@@ -10,7 +10,7 @@
  * Description:     Build better sites in WordPress fast
  * Author:          Redux.io + Dovy Paukstys
  * Author URI:      http://redux.io
- * Version:         4.1.17
+ * Version:         4.1.18
  * Text Domain:     redux-framework
  * License:         GPLv3 or later
  * License URI:     http://www.gnu.org/licenses/gpl-3.0.txt

redux-templates/classes/class-api.php

@@ -615,10 +615,7 @@ public function check_template_response( $parameters ) {
 			if ( \Redux_Functions_Ex::activated() ) {
 				$response['left'] = 999;
 			} else {
-				$count = get_user_meta( $parameters['uid'], '_redux_templates_counts', true );
-				if ( false === $count ) {
-					$count = ReduxTemplates\Init::$default_left;
-				}
+				$count = ReduxTemplates\Init::left( $parameters['uid'] );
 				$count = intval( $count ) - 1;
 				if ( intval( $count ) < 0 ) {
 					update_user_meta( $parameters['uid'], '_redux_templates_counts', 0 );

redux-templates/classes/class-init.php

@@ -142,11 +142,7 @@ public function editor_assets() {
 			// phpcs:disable Squiz.PHP.CommentedOutCode
 			// delete_user_meta( get_current_user_id(), '_redux_templates_counts'); // To test left.
 			if ( ! \Redux_Functions_Ex::activated() ) {
-				$count = get_user_meta( get_current_user_id(), '_redux_templates_counts', true );
-				if ( '' === $count ) {
-					$count = self::$default_left;
-				}
-				$global_vars['left'] = $count;
+				$global_vars['left'] = ReduxTemplates\Init::left( get_current_user_id() );
 			} else {
 				$global_vars['left'] = 999;
 			}
@@ -194,6 +190,23 @@ public function admin_assets() {
 			REDUXTEMPLATES_VERSION
 		);
 	}
+
+	/**
+	 * Get the items left.
+	 *
+	 * @param int $uid User ID number.
+	 * @access public
+	 * @since 4.1.18
+	 * @return int
+	 */
+	public static function left( $uid ) {
+		$count = get_user_meta( $uid, '_redux_templates_counts', true );
+		if ( 0 !== $count && empty( $count ) ) {
+			$count = self::$default_left;
+		}
+		return $count;
+	}
+
 }
 
 new Init();