1.4.11

webmandesign · Oct 31, 2017 · ba654bb · ba654bb
1 parent bd6f867
commit ba654bb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,17 @@
 # WebMan Amplifier Changelog
 
+## 1.4.11
+
+* **Fix**: Do not override shortcodes scripts enqueuing when `slick` is in array
+
+### Files changed:
+
+ changelog.md
+ readme.txt
+ webman-amplifier.php
+ includes/shortcodes/class-shortcodes.php
+
+
 ## 1.4.10
 
 * **Fix**: Issue introduced in version 1.4.9

diff --git a/includes/shortcodes/class-shortcodes.php b/includes/shortcodes/class-shortcodes.php
@@ -20,7 +20,7 @@
  * @subpackage Shortcodes
  *
  * @since 1.0
- * @version 1.4.10
+ * @version 1.4.11
  */
 if ( ! class_exists( 'WM_Shortcodes' ) ) {
 
@@ -1182,14 +1182,14 @@ function wma_shortcodes() {
  * WM_Shortcodes helper functions
  *
  * @since 1.0.9.8
- * @version 1.3.11
+ * @version 1.4.11
  */
 
  /**
  * Shortcode enqueue scripts
  *
  * @since 1.0.9.8
- * @version 1.3.11
+ * @version 1.4.11
  *
  * @param string $shortcode
  * @param array $enqueue_scripts
@@ -1218,12 +1218,9 @@ function wma_shortcode_enqueue_scripts( $shortcode = '', $enqueue_scripts = arra
  // Fixing legacy theme compatibility (@todo Remove when themes are updated)
 
  if ( in_array( 'slick', $enqueue_scripts ) ) {
-
- $enqueue_scripts = array(
- 'slick',
- 'wm-shortcodes-posts-slick'
- );
-
+ $enqueue_scripts = array_merge( $enqueue_scripts, array(
+ 'wm-shortcodes-posts-slick'
+ ) );
  }
 
  // Enqueue scripts

diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Donate link: https://www.webmandesign.eu
 Author URI: https://www.webmandesign.eu
 Plugin URI: https://github.com/webmandesign/webman-amplifier
 Requires at least: 4.3
-Tested up to: 4.8
-Stable tag: 1.4.10
+Tested up to: 4.9
+Stable tag: 1.4.11
 License: GNU General Public License v3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 Tags: webman, accordion, audio, button, call to action, column, row, section, content, module, countdown, timer, divider, dropcap, icon, list, marker, message, box, posts, related, price, pricing table, progress, skillbar, pullquote, separator, heading, slideshow, slider, table, tabs, toggles, testimonials, video, widget area, sidebar, responsive, shortcode, shortcodes, custom post types, projects, portfolio, staff, logos, modules, beaver builder, page builder, metabox, meta, generator, fonticons, fontello, widgets, twitter, contact, sub navigation, tabbed widgets
@@ -102,6 +102,9 @@ Please see the [`changelog.md` file](https://github.com/webmandesign/webman-ampl
 
 == Upgrade Notice ==
 
+= 1.4.11 =
+Fixing shortcode related scripts enqueuing function.
+
 = 1.4.10 =
 Fixing issue introduced in version 1.4.9.
 

diff --git a/webman-amplifier.php b/webman-amplifier.php
@@ -15,15 +15,15 @@
  * Plugin Name: WebMan Amplifier
  * Plugin URI: https://github.com/webmandesign/webman-amplifier
  * Description: Pack of additional WordPress features. Contains additional custom post types, shortcodes, page builder integration, meta box generator and icon font management.
- * Version: 1.4.10
+ * Version: 1.4.11
  * Author: WebMan - Oliver Juhas
  * Author URI: https://www.webmandesign.eu
  * Text Domain: webman-amplifier
  * Domain Path: /languages
  * License: GNU General Public License v3
  * License URI: http://www.gnu.org/licenses/gpl-3.0.txt
  * Requires at least: 4.3
- * Tested up to: 4.8
+ * Tested up to: 4.9
  */