Merge branch 'develop'

CherryFramework · Apr 12, 2016 · dc4f17b · dc4f17b
2 parents 89371c4 + b72c1bf
commit dc4f17b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 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
@@ -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
@@ -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;
 			}
 

diff --git 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