Fix J2.5 t3media element not target correct folder

t3framework · Dec 4, 2013 · 927af99 · 927af99
1 parent 09a1d8f
commit 927af99
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/source/plg_system_t3/base-bs3/js/nav-collapse.js b/source/plg_system_t3/base-bs3/js/nav-collapse.js
@@ -25,11 +25,6 @@ jQuery(document).ready(function ($) {
         // rebuild
         lis.each(function () {
 
-            //remove Mootool conflict
-            if(window.MooTools && window.MooTools.More && Element && Element.implement){
-                this.show = null; this.hide = null;
-            }
-
             // get firstchild - a or span
             var $li = $(this),
                 $child = $li.find('>:first-child');

diff --git a/source/plg_system_t3/includes/depend/t3media.php b/source/plg_system_t3/includes/depend/t3media.php
@@ -218,7 +218,7 @@ protected function getInput()
 			if ($this->value && file_exists(JPATH_ROOT . '/' . $this->value))
 			{
 				$folder = explode('/', $this->value);
-				array_diff_assoc($folder, explode('/', JComponentHelper::getParams('com_media')->get('image_path', 'images')));
+				$folder = array_diff_assoc($folder, explode('/', JComponentHelper::getParams('com_media')->get('image_path', 'images')));
 				array_pop($folder);
 				$folder = implode('/', $folder);
 			}