Enhanced Media Library - Version 2.3.4

Version Description

Release Date - November 19, 2016

Download this release

Release Info

Developer webbistro
Plugin Icon 128x128 Enhanced Media Library
Version 2.3.4
Comparing to
See all releases

Code changes from version 2.3.3 to 2.3.4

Files changed (4) hide show
  1. core/options-pages.php +5 -2
  2. core/taxonomies.php +42 -26
  3. enhanced-media-library.php +2 -2
  4. readme.txt +10 -2
core/options-pages.php CHANGED
@@ -162,9 +162,12 @@ if ( ! function_exists( 'wpuxss_eml_admin_menu' ) ) {
162
  * @created 14/06/16
163
  */
164
 
165
- function wpuxss_eml_load_media_options_page() {
166
 
167
- do_action( 'load-options-media.php' );
 
 
 
168
  }
169
 
170
 
162
  * @created 14/06/16
163
  */
164
 
165
+ if ( ! function_exists( 'wpuxss_eml_load_media_options_page' ) ) {
166
 
167
+ function wpuxss_eml_load_media_options_page() {
168
+
169
+ do_action( 'load-options-media.php' );
170
+ }
171
  }
172
 
173
 
core/taxonomies.php CHANGED
@@ -202,69 +202,85 @@ if ( ! function_exists( 'wpuxss_eml_ajax_query_attachments_args' ) ) {
202
  function wpuxss_eml_ajax_query_attachments_args( $query ) {
203
 
204
  $wpuxss_eml_taxonomies = get_option( 'wpuxss_eml_taxonomies', array() );
205
- $uncategorized = ( isset( $query['uncategorized'] ) && $query['uncategorized'] ) ? 1 : 0;
206
  $tax_query = array();
 
 
 
 
 
 
 
 
 
 
 
207
 
 
 
208
 
209
- foreach ( get_object_taxonomies( 'attachment', 'object' ) as $taxonomy ) {
 
 
 
210
 
211
- if ( ! array_key_exists( $taxonomy->name, $wpuxss_eml_taxonomies ) ) {
212
  continue;
213
  }
214
 
215
  if ( $uncategorized ) {
216
 
217
- $terms = get_terms( $taxonomy->name, array( 'fields' => 'ids', 'get' => 'all' ) );
218
 
219
- $tax_query[] = array(
220
- 'taxonomy' => $taxonomy->name,
221
- 'field' => 'term_id',
222
- 'terms' => $terms,
223
- 'operator' => 'NOT IN'
224
- );
 
 
 
 
 
225
  }
226
  else {
227
 
228
- if ( isset( $query[$taxonomy->query_var] ) && $query[$taxonomy->query_var] ) {
229
 
230
- if( is_numeric( $query[$taxonomy->query_var] ) ||
231
- is_array( $query[$taxonomy->query_var] ) ) {
232
 
233
  $tax_query[] = array(
234
- 'taxonomy' => $taxonomy->name,
235
  'field' => 'term_id',
236
- 'terms' => (array) $query[$taxonomy->query_var]
237
  );
238
  }
239
- elseif ( 'not_in' === $query[$taxonomy->query_var] ) {
240
 
241
- $terms = get_terms( $taxonomy->name, array('fields'=>'ids','get'=>'all') );
242
 
243
  $tax_query[] = array(
244
- 'taxonomy' => $taxonomy->name,
245
  'field' => 'term_id',
246
  'terms' => $terms,
247
  'operator' => 'NOT IN',
248
  );
249
  }
250
- elseif ( 'in' === $query[$taxonomy->query_var] ) {
251
 
252
- $terms = get_terms( $taxonomy->name, array('fields'=>'ids','get'=>'all') );
253
 
254
  $tax_query[] = array(
255
- 'taxonomy' => $taxonomy->name,
256
  'field' => 'term_id',
257
  'terms' => $terms,
258
  'operator' => 'IN',
259
  );
260
  }
261
- }
262
- }
263
 
264
- if ( isset( $query[$taxonomy->query_var] ) ) {
265
- unset( $query[$taxonomy->query_var] );
266
  }
267
-
268
  } // endforeach
269
 
270
  if ( ! empty( $tax_query ) ) {
202
  function wpuxss_eml_ajax_query_attachments_args( $query ) {
203
 
204
  $wpuxss_eml_taxonomies = get_option( 'wpuxss_eml_taxonomies', array() );
 
205
  $tax_query = array();
206
+ $eml_query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
207
+ $processed_taxonomies = get_object_taxonomies( 'attachment', 'object' );
208
+ $keys = array(
209
+ 'uncategorized'
210
+ );
211
+
212
+ foreach ( $processed_taxonomies as $taxonomy => $params ) {
213
+ if ( isset( $eml_query[$taxonomy] ) ) {
214
+ $keys[] = $taxonomy;
215
+ }
216
+ }
217
 
218
+ $eml_query = array_intersect_key( $eml_query, array_flip( $keys ) );
219
+ $query = array_merge( $query, $eml_query );
220
 
221
+ $uncategorized = ( isset( $query['uncategorized'] ) && $query['uncategorized'] ) ? 1 : 0;
222
+
223
+
224
+ foreach ( $processed_taxonomies as $taxonomy_name => $params ) {
225
 
226
+ if ( ! array_key_exists( $taxonomy_name, $wpuxss_eml_taxonomies ) ) {
227
  continue;
228
  }
229
 
230
  if ( $uncategorized ) {
231
 
232
+ $terms = get_terms( $taxonomy_name, array( 'fields' => 'ids', 'get' => 'all' ) );
233
 
234
+ if ( ! empty( $terms ) ) {
235
+
236
+ $tax_query[] = array(
237
+ 'taxonomy' => $taxonomy_name,
238
+ 'field' => 'term_id',
239
+ 'terms' => $terms,
240
+ 'operator' => 'NOT IN'
241
+ );
242
+
243
+ unset( $query['uncategorized'] );
244
+ }
245
  }
246
  else {
247
 
248
+ if ( isset( $query[$taxonomy_name] ) && $query[$taxonomy_name] ) {
249
 
250
+ if( is_numeric( $query[$taxonomy_name] ) || is_array( $query[$taxonomy_name] ) ) {
 
251
 
252
  $tax_query[] = array(
253
+ 'taxonomy' => $taxonomy_name,
254
  'field' => 'term_id',
255
+ 'terms' => (array) $query[$taxonomy_name]
256
  );
257
  }
258
+ elseif ( 'not_in' === $query[$taxonomy_name] ) {
259
 
260
+ $terms = get_terms( $taxonomy_name, array('fields'=>'ids','get'=>'all') );
261
 
262
  $tax_query[] = array(
263
+ 'taxonomy' => $taxonomy_name,
264
  'field' => 'term_id',
265
  'terms' => $terms,
266
  'operator' => 'NOT IN',
267
  );
268
  }
269
+ elseif ( 'in' === $query[$taxonomy_name] ) {
270
 
271
+ $terms = get_terms( $taxonomy_name, array('fields'=>'ids','get'=>'all') );
272
 
273
  $tax_query[] = array(
274
+ 'taxonomy' => $taxonomy_name,
275
  'field' => 'term_id',
276
  'terms' => $terms,
277
  'operator' => 'IN',
278
  );
279
  }
 
 
280
 
281
+ unset( $query[$taxonomy_name] );
282
+ }
283
  }
 
284
  } // endforeach
285
 
286
  if ( ! empty( $tax_query ) ) {
enhanced-media-library.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Enhanced Media Library
4
  Plugin URI: http://wpUXsolutions.com
5
  Description: This plugin will be handy for those who need to manage a lot of media files.
6
- Version: 2.3.3
7
  Author: wpUXsolutions
8
  Author URI: http://wpUXsolutions.com
9
  Text Domain: enhanced-media-library
@@ -27,7 +27,7 @@ global $wp_version,
27
 
28
 
29
 
30
- $wpuxss_eml_version = '2.3.3';
31
 
32
 
33
 
3
  Plugin Name: Enhanced Media Library
4
  Plugin URI: http://wpUXsolutions.com
5
  Description: This plugin will be handy for those who need to manage a lot of media files.
6
+ Version: 2.3.4
7
  Author: wpUXsolutions
8
  Author URI: http://wpUXsolutions.com
9
  Text Domain: enhanced-media-library
27
 
28
 
29
 
30
+ $wpuxss_eml_version = '2.3.4';
31
 
32
 
33
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: webbistro
3
  Tags: media library, media category, media categories, media gallery, gallery shortcode, media tag, media tags, media taxonomy, media taxonomies, media uploader, mime type, mime, mime types, file types, media types, media filter, attachment, gallery, image, images, media, ux, user experience, wp-admin, admin, taxonomy, taxonomies
4
  Requires at least: 4.5
5
  Tested up to: 4.6.1
6
- Stable tag: 2.3.3
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -162,6 +162,14 @@ Please notice that you use the Enhanced Media Library with other plugins that ad
162
 
163
  == Changelog ==
164
 
 
 
 
 
 
 
 
 
165
  = 2.3.3 =
166
  *Release Date - November 13, 2016*
167
 
@@ -201,7 +209,7 @@ Please notice that you use the Enhanced Media Library with other plugins that ad
201
  *Release Date - June 27, 2016*
202
 
203
  = Improvements =
204
- * All bulk operations are now dramatically (!) faster: save order, bulk assign terms (PRO only), bulk trash / restore / delete (PRO only). It actually takes seconds now to assign hundreds of media items in bulk.
205
  * Bulk Trash / Restore added (PRO only)
206
  * "Show Count" option added to Media Taxonomies tab
207
  * Term count is now being calculated correctly and separately for different post types when they share a taxonomy with media library
3
  Tags: media library, media category, media categories, media gallery, gallery shortcode, media tag, media tags, media taxonomy, media taxonomies, media uploader, mime type, mime, mime types, file types, media types, media filter, attachment, gallery, image, images, media, ux, user experience, wp-admin, admin, taxonomy, taxonomies
4
  Requires at least: 4.5
5
  Tested up to: 4.6.1
6
+ Stable tag: 2.3.4
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
162
 
163
  == Changelog ==
164
 
165
+ = 2.3.4 =
166
+ *Release Date - November 19, 2016*
167
+
168
+ = Bugfixes =
169
+ * A bug of v2.3.2 and v2.3.3 with incorrect media filtering fixed
170
+
171
+
172
+  
173
  = 2.3.3 =
174
  *Release Date - November 13, 2016*
175
 
209
  *Release Date - June 27, 2016*
210
 
211
  = Improvements =
212
+ * All bulk operations are now dramatically (!) faster: save order, bulk assign terms (PRO only), bulk trash / restore / delete (PRO only). It actually takes seconds now to assign hundreds of media items in bulk
213
  * Bulk Trash / Restore added (PRO only)
214
  * "Show Count" option added to Media Taxonomies tab
215
  * Term count is now being calculated correctly and separately for different post types when they share a taxonomy with media library