Merge branch 'master' into feature/move-pear-libs-to-composer

Geeklog-Core · Sep 29, 2016 · 09fd8e7 · 09fd8e7
2 parents 89f76e5 + 1b3fd97
commit 09fd8e7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/public_html/layout/denim/functions.php b/public_html/layout/denim/functions.php
@@ -121,7 +121,7 @@ function theme_css_denim()
     );
 
     if (!empty($theme_var_denim['uikit_components'])) {
-        $uikit_components = array_unique($theme_var_denim['uikit_components']);
+        $uikit_components = array_merge($theme_var_denim['uikit_components']);
         foreach ($uikit_components as $component => $value) {
             if ($value === 1) {
                 $componame = str_replace('_', '-', $component);
@@ -171,7 +171,7 @@ function theme_js_files_denim()
     );
 
     if (!empty($theme_var_denim['uikit_components'])) {
-        $uikit_components = array_unique($theme_var_denim['uikit_components']);
+        $uikit_components = array_merge($theme_var_denim['uikit_components']);
         foreach ($uikit_components as $component => $value) {
             if ($value === 1) {
                 $componame = str_replace('_', '-', $component);