v7.1-b3: Check version after upgraded to reduce the requests.

Author: Hai Zheng

src/conf.cls.php

@@ -75,9 +75,10 @@ private function _conf_db_init()
 		/**
 		 * Version is less than v3.0, or, is a new installation
 		 */
+		$ver_check_tag = '';
 		if (!$ver) {
 			// Try upgrade first (network will upgrade inside too)
-			Data::cls()->try_upgrade_conf_3_0();
+			$ver_check_tag = Data::cls()->try_upgrade_conf_3_0();
 		} else {
 			defined('LSCWP_CUR_V') || define('LSCWP_CUR_V', $ver);
 
@@ -87,7 +88,7 @@ private function _conf_db_init()
 			if ($ver != Core::VER) {
 				// Plugin version will be set inside
 				// Site plugin upgrade & version change will do in load_site_conf
-				Data::cls()->conf_upgrade($ver);
+				$ver_check_tag = Data::cls()->conf_upgrade($ver);
 			}
 		}
 
@@ -101,8 +102,7 @@ private function _conf_db_init()
 				// New install
 				$this->set_conf(self::$_default_options);
 
-				// Check new version @since 2.9.3
-				Cloud::version_check('activate' . (defined('LSCWP_REF') ? '_' . LSCWP_REF : ''));
+				$ver_check_tag .= ' activate' . (defined('LSCWP_REF') ? '_' . LSCWP_REF : '');
 			}
 
 			// Init new default/missing options
@@ -114,6 +114,10 @@ private function _conf_db_init()
 
 			// Force correct version in case a rare unexpected case that `_ver` exists but empty
 			self::update_option(Base::_VER, Core::VER);
+
+			if ($ver_check_tag) {
+				Cloud::version_check($ver_check_tag);
+			}
 		}
 
 		/**

src/data.cls.php

@@ -146,7 +146,7 @@ public function conf_upgrade($ver)
 		!defined('LSWCP_EMPTYCACHE') && define('LSWCP_EMPTYCACHE', true); // clear all sites caches
 		Purge::purge_all();
 
-		Cloud::version_check('upgrade');
+		return 'upgrade';
 	}
 
 	/**
@@ -256,8 +256,7 @@ public function try_upgrade_conf_3_0()
 	{
 		$previous_options = get_option('litespeed-cache-conf');
 		if (!$previous_options) {
-			Cloud::version_check('new');
-			return;
+			return 'new';
 		}
 
 		$ver = $previous_options['version'];
@@ -288,7 +287,7 @@ public function try_upgrade_conf_3_0()
 		// Upgrade from 3.0 to latest version
 		$ver = '3.0';
 		if (Core::VER != $ver) {
-			$this->conf_upgrade($ver);
+			return $this->conf_upgrade($ver);
 		} else {
 			// Reload options
 			$this->cls('Conf')->load_options();
@@ -298,7 +297,7 @@ public function try_upgrade_conf_3_0()
 			!defined('LSWCP_EMPTYCACHE') && define('LSWCP_EMPTYCACHE', true); // clear all sites caches
 			Purge::purge_all();
 
-			Cloud::version_check('upgrade');
+			return 'upgrade';
 		}
 	}