← All changes | inc/conflicts/jetpack_photon.php +2 -8 4.2.5 → trunk View file →

		@@ -33,15 +33,9 @@
33	33	* @since 2.0.6
34	34	* @access public
35	35	*/
36	36	public function is_conflict_valid() {
	37	+ $compatibility = new Optml_jetpack_photon_compatibility();
37	38
38		- if ( ! is_plugin_active( 'jetpack/jetpack.php' ) ) {
39		- return false;
40		- }
41		- if ( ! class_exists( 'Jetpack', false ) ) {
42		- return false;
43		- }
44		-
45		- return Jetpack::is_module_active( 'photon' );
	39	+ return $compatibility->should_load();
46	40	}
47	41	}