From a7ac41f2135a7c8804961727a0c12deb57f8952a Mon Sep 17 00:00:00 2001 From: cheh Date: Tue, 12 Apr 2016 16:50:34 +0300 Subject: [PATCH 1/2] FIX: epic bug with updates logic --- .../class-cherry-update/class-cherry-plugin-update.php | 6 +----- .../class-cherry-update/class-cherry-theme-update.php | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/classes/class-cherry-update/class-cherry-plugin-update.php b/lib/classes/class-cherry-update/class-cherry-plugin-update.php index b5dd3a45..98b62661 100644 --- a/lib/classes/class-cherry-update/class-cherry-plugin-update.php +++ b/lib/classes/class-cherry-update/class-cherry-plugin-update.php @@ -34,11 +34,7 @@ class Cherry_Plugin_Update extends Cherry_Base_Update { */ public function init( $attr = array() ) { - if ( ! defined( 'CHERRY_UPDATE' ) ) { - return; - } - - if ( false === CHERRY_UPDATE ) { + if ( defined( 'CHERRY_UPDATE' ) && false === CHERRY_UPDATE ) { return; } diff --git a/lib/classes/class-cherry-update/class-cherry-theme-update.php b/lib/classes/class-cherry-update/class-cherry-theme-update.php index 7dbc138d..d3e41be9 100644 --- a/lib/classes/class-cherry-update/class-cherry-theme-update.php +++ b/lib/classes/class-cherry-update/class-cherry-theme-update.php @@ -34,11 +34,7 @@ class Cherry_Theme_Update extends Cherry_Base_Update { */ public function init( $attr = array() ) { - if ( ! defined( 'CHERRY_UPDATE' ) ) { - return; - } - - if ( false === CHERRY_UPDATE ) { + if ( defined( 'CHERRY_UPDATE' ) && false === CHERRY_UPDATE ) { return; } From b72c1bf417e9753a3bebe696f22cdf1fff771d04 Mon Sep 17 00:00:00 2001 From: cheh Date: Tue, 12 Apr 2016 16:51:16 +0300 Subject: [PATCH 2/2] UPD: Version bump to 4.0.5.3 --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index 9b818aa2..4f435892 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: http://www.cherryframework.com/ Author: Cherry Team Author URI: http://www.cherryframework.com/ Description: Cherry Framework parent theme based on _s started theme for WordPress with enhanced functionality and extended possibilities. -Version: 4.0.5.2 +Version: 4.0.5.3 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Tags: fixed-layout, fluid-layout, responsive-layout, left-sidebar, right-sidebar, custom-menu, featured-images, full-width-template, post-formats, sticky-post, theme-options, translation-ready