From af4c16e593857c3f1853dcafabfa8b90bd3af38d Mon Sep 17 00:00:00 2001
From: rica-carv <rica-carv@users.noreply.github.com>
Date: Tue, 6 Dec 2016 19:01:08 +0000
Subject: [PATCH] Update shortcode_handler.php

---
 e107_handlers/shortcode_handler.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/e107_handlers/shortcode_handler.php b/e107_handlers/shortcode_handler.php
index b9b7b305d..c059585ce 100644
--- a/e107_handlers/shortcode_handler.php
+++ b/e107_handlers/shortcode_handler.php
@@ -1421,12 +1421,14 @@ class e_parse_shortcode
 		{
 			$this->nowrap = $code;
 			$pre = $this->parseCodes($pre, true, $this->addedCodes);
+			$this->nowrap = false;
 		}
 
 		if(strpos($post, '{') !== false) // shortcode found in wrapper
 		{
 			$this->nowrap = $code;
 			$post = $this->parseCodes($post, true, $this->addedCodes);
+			$this->nowrap = false;
 		}
 
 		return $pre.$ret.$post;