← All changes | inc/conflicts/wprocket.php +7 -3 3.1.3 → trunk View file →

		@@ -4,9 +4,9 @@
4	4	* Class Optml_Wprocket
5	5	*
6	6	* An example of a conflict.
7	7	*/
8		-class Optml_Wprocket extends Optml_abstract_conflict {
	8	+class Optml_Wprocket extends Optml_Abstract_Conflict {
9	9
10	10	/**
11	11	* Optml_Wprocket constructor.
12	12	*/
		@@ -21,9 +21,13 @@
21	21	* @since 2.0.6
22	22	* @access public
23	23	*/
24	24	public function define_message() {
25		- $this->message = sprintf( __( 'It seems your are using %1$sWP Rocket%2$s with Lazy loading for images option active. %3$s Optimole already provides a lazy loading mechanism by it\'s own which might conflict with this. If you would like to further use Optimole lazy loading feature, you can turn that off from %4$sSettings -> WP Rocket -> Media%5$s page. ', 'optimole-wp' ), '<b>', '</b>', '<br/>', '<a target="_blank" href="' . admin_url( 'options-general.php?page=wprocket#media' ) . '">', '</a>' );
	25	+ $this->message = sprintf(
	26	+ /* translators: 1 is plugin name, 2 is the settings path link */
	27	+ __( 'WP Rocket has <strong>Lazy loading for images</strong> enabled. Optimole already provides its own lazy loading mechanism, which may conflict with WP Rocket\'s. To continue using Optimole\'s lazy loading feature, please disable lazy loading in WP Rocket via %1$s.', 'optimole-wp' ),
	28	+ '<a href="' . admin_url( 'options-general.php?page=wprocket#media' ) . '">Settings → WP Rocket → Media</a>'
	29	+ );
26	30	}
27	31
28	32	/**
29	33	* Determine if conflict is applicable.
		@@ -33,9 +37,9 @@
33	37	* @access public
34	38	*/
35	39	public function is_conflict_valid() {
36	40
37		- if ( ! is_plugin_active( 'wp-rocket/wp-rocket.php' ) && ! is_plugin_active( 'wp-rocket/wp-rocket.php' ) ) {
	41	+ if ( ! is_plugin_active( 'wp-rocket/wp-rocket.php' ) ) {
38	42	return false;
39	43	}
40	44	if ( ! function_exists( 'get_rocket_option' ) ) {
41	45	return false;