diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 6dd1fdb87..ac46ca5c2 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -1254,7 +1254,7 @@ class Context {
 	/**
 	 * @brief javascript plugin load
 	 **/
-	function loadJavascriptPlugin($plugin_name, $type='body') {
+	function loadJavascriptPlugin($plugin_name) {
 		static $loaded_plugins = array();
 
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -1273,7 +1273,7 @@ class Context {
 			if(!$filename) continue;
 
 			if(substr($filename,0,2)=='./') $filename = substr($filename,2);
-			if(preg_match('/\.js$/i',  $filename))     $self->loadFile(array($plugin_path.$filename, $type, '', 0), true);
+			if(preg_match('/\.js$/i',  $filename))     $self->loadFile(array($plugin_path.$filename, 'body', '', 0), true);
 			elseif(preg_match('/\.css$/i', $filename)) $self->loadFile(array($plugin_path.$filename, 'all', '', 0), true);
 		}
 
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 1b61ae232..281801d85 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -427,7 +427,7 @@ class TemplateHandler {
 		{
 			$attr = array();
 			if($m[5]) {
-				if(preg_match_all('@,(?: +)?(\w+)="([^"]+)"@', $m[6], $mm)) {
+				if(preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm)) {
 					foreach($mm[1] as $idx=>$name) {
 						$attr[$name] = $mm[2][$idx];
 					}
@@ -458,15 +458,7 @@ class TemplateHandler {
 					$plugin = $this->_replaceVar($m[5]);
 					if(strpos($plugin, '$__Context') === false) $plugin = "'{$plugin}'";
 
-					if($attr['type'])
-					{
-						$type = "'{$attr['type']}'";
-						return "<?php Context::loadJavascriptPlugin({$plugin}, {$type}); ?>";
-					}
-					else
-					{
-						return "<?php Context::loadJavascriptPlugin({$plugin}); ?>";
-					}
+					return "<?php Context::loadJavascriptPlugin({$plugin}); ?>";
 
 				// <load ...> or <unload ...> or <!--%import ...--> or <!--%unload ...-->
 				case 'import':