1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00

Merge pull request #2122 from rica-carv/rica-carv-patch-3

Small bug correction in #2113
This commit is contained in:
Cameron
2016-12-06 11:19:50 -08:00
committed by GitHub

View File

@@ -1421,12 +1421,14 @@ class e_parse_shortcode
{ {
$this->nowrap = $code; $this->nowrap = $code;
$pre = $this->parseCodes($pre, true, $this->addedCodes); $pre = $this->parseCodes($pre, true, $this->addedCodes);
$this->nowrap = false;
} }
if(strpos($post, '{') !== false) // shortcode found in wrapper if(strpos($post, '{') !== false) // shortcode found in wrapper
{ {
$this->nowrap = $code; $this->nowrap = $code;
$post = $this->parseCodes($post, true, $this->addedCodes); $post = $this->parseCodes($post, true, $this->addedCodes);
$this->nowrap = false;
} }
return $pre.$ret.$post; return $pre.$ret.$post;