From 38a1d8399f6f9829a5f7d723eb6841739b504556 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Fri, 11 Nov 2016 17:48:46 -0800
Subject: [PATCH] Issue #2018 - Figcaption problem when not using WYSIWYG.

---
 e107_core/bbcodes/bb_img.php    | 2 +-
 e107_handlers/e_parse_class.php | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/e107_core/bbcodes/bb_img.php b/e107_core/bbcodes/bb_img.php
index d06169905..60ec525ba 100644
--- a/e107_core/bbcodes/bb_img.php
+++ b/e107_core/bbcodes/bb_img.php
@@ -23,7 +23,7 @@ class bb_img extends e_bb_base
 		if(vartrue($parms['class'])) 	$safe['class'] = eHelper::secureClassAttr($parms['class']);
 		if(vartrue($parms['id']))		$safe['id']     = eHelper::secureIdAttr($parms['id']);
 		if(vartrue($parms['style'])) 	$safe['style'] = eHelper::secureStyleAttr($parms['style']);
-		if(vartrue($parms['alt'])) 	    $safe['alt'] = e107::getParser()->filter($parms['style'],'str');
+		if(vartrue($parms['alt'])) 	    $safe['alt'] = e107::getParser()->filter($parms['alt'],'str');
 
 		if($safe)
 		{
diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index ffedef130..e10819b93 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -792,6 +792,7 @@ class e_parse extends e_parser
 		if (e107::wysiwyg() !== true)
 		{
 			// fix for utf-8 issue with html_entity_decode(); ???
+			$text = urldecode($text);
 		//	$text = str_replace("&nbsp;", " ", $text);
 		}
 		return $text;