Photo Gallery by Envira – Responsive Image Gallery for WordPress - Version 1.6.1.4

Version Description

Download this release

Release Info

Developer chrisakelley
Plugin Icon 128x128 Photo Gallery by Envira – Responsive Image Gallery for WordPress
Version 1.6.1.4
Comparing to
See all releases

Code changes from version 1.6.1.3 to 1.6.1.4

envira-gallery-lite.php CHANGED
@@ -5,7 +5,7 @@
5
  * Description: Envira Gallery is best responsive WordPress gallery plugin. This is the lite version.
6
  * Author: Envira Gallery Team
7
  * Author URI: http://enviragallery.com
8
- * Version: 1.6.1.3
9
  * Text Domain: envira-gallery
10
  *
11
  * Envira Gallery is free software: you can redistribute it and/or modify
@@ -53,7 +53,7 @@ class Envira_Gallery_Lite {
53
  *
54
  * @var string
55
  */
56
- public $version = '1.6.1.3';
57
 
58
  /**
59
  * The name of the plugin.
5
  * Description: Envira Gallery is best responsive WordPress gallery plugin. This is the lite version.
6
  * Author: Envira Gallery Team
7
  * Author URI: http://enviragallery.com
8
+ * Version: 1.6.1.4
9
  * Text Domain: envira-gallery
10
  *
11
  * Envira Gallery is free software: you can redistribute it and/or modify
53
  *
54
  * @var string
55
  */
56
+ public $version = '1.6.1.4';
57
 
58
  /**
59
  * The name of the plugin.
includes/admin/metaboxes.php CHANGED
@@ -55,6 +55,10 @@ class Envira_Gallery_Metaboxes {
55
  add_action( 'admin_enqueue_scripts', array( $this, 'styles' ) );
56
  add_action( 'admin_enqueue_scripts', array( $this, 'scripts' ) );
57
 
 
 
 
 
58
  // Metaboxes
59
  add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 1 );
60
 
@@ -307,6 +311,36 @@ class Envira_Gallery_Metaboxes {
307
 
308
  }
309
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
310
  /**
311
  * Amends the default Plupload parameters for initialising the Media Uploader, to ensure
312
  * the uploaded image is attached to our Envira CPT
55
  add_action( 'admin_enqueue_scripts', array( $this, 'styles' ) );
56
  add_action( 'admin_enqueue_scripts', array( $this, 'scripts' ) );
57
 
58
+ // Conflict resolvers and plugin busters
59
+ add_action( 'admin_enqueue_scripts', array( $this, 'fix_plugin_js_conflicts' ), 100 );
60
+ add_action( 'wp_print_scripts', array( $this, 'fix_plugin_js_conflicts' ), 100 );
61
+
62
  // Metaboxes
63
  add_action( 'add_meta_boxes', array( $this, 'add_meta_boxes' ), 1 );
64
 
311
 
312
  }
313
 
314
+ /**
315
+ * Remove plugins scripts that break Envira's admin.
316
+ *
317
+ * @access public
318
+ * @return void
319
+ */
320
+ public function fix_plugin_js_conflicts(){
321
+
322
+ global $id, $post;
323
+
324
+ // Get current screen.
325
+
326
+ if ( ! function_exists( 'get_current_screen' ) ) {
327
+ return;
328
+ }
329
+
330
+ $screen = get_current_screen();
331
+
332
+ // Bail if we're not on the Envira Post Type screen.
333
+ if ( 'envira' !== $screen->post_type ) {
334
+ return;
335
+ }
336
+
337
+ wp_dequeue_style ( 'thrive-theme-options' );
338
+ wp_dequeue_script( 'thrive-theme-options' );
339
+ wp_dequeue_script( 'ngg-igw' );
340
+ wp_dequeue_script( 'yoast_ga_admin' ); /* Yoast Clicky Plugin */
341
+
342
+ }
343
+
344
  /**
345
  * Amends the default Plupload parameters for initialising the Media Uploader, to ensure
346
  * the uploaded image is attached to our Envira CPT