From a44401202bd7ab5212b5edf405afdb493d20bb4f Mon Sep 17 00:00:00 2001
From: SecretR <secretr@e107.org>
Date: Thu, 24 Oct 2013 01:04:40 +0300
Subject: [PATCH] Plugin bbcodes fix

---
 e107_core/shortcodes/batch/bbcode_shortcodes.php | 3 ++-
 e107_handlers/bbcode_handler.php                 | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
index 82820cc8a..ea48bc2a6 100644
--- a/e107_core/shortcodes/batch/bbcode_shortcodes.php
+++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -407,6 +407,7 @@ class bbcode_shortcodes extends e_shortcode
 		global $pref, $eplug_bb, $bbcode_func, $bbcode_help, $bbcode_filedir, $bbcode_imagedir, $bbcode_helpactive, $bbcode_helptag, $register_bb;
 
 	//	if(defsettrue('e_WYSIWYG')){ return; }
+		$eplug_bb = $this->var['eplug_bb'] ? $this->var['eplug_bb'] : array();
 
 		$bbcode_func = ($this->var['trigger']) ? $this->var['trigger'] : "addtext";
 		
@@ -481,7 +482,7 @@ class bbcode_shortcodes extends e_shortcode
 			}
 		}
 
-
+		
 		if (!empty($eplug_bb))
 		{
 			foreach($eplug_bb as $val)  // allow plugins to plug into it.
diff --git a/e107_handlers/bbcode_handler.php b/e107_handlers/bbcode_handler.php
index 6cec890a9..7493763bd 100644
--- a/e107_handlers/bbcode_handler.php
+++ b/e107_handlers/bbcode_handler.php
@@ -531,7 +531,8 @@ class e_bbcode
 				'trigger'		=> vartrue($options['trigger']), // For BC
 		//		'hint_func'		=> $helpfunc, // deprecated and unused
 		//		'hint_active'	=> $bbcode_helpactive,  // deprecated and unused
-				'size'			=> vartrue($helpsize)
+				'size'			=> vartrue($helpsize),
+				'eplug_bb'			=> $eplug_bb,
 		);
 				
 		$bbcode_shortcodes->setVars($data);