mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2113 from rica-carv/rica-carv-patch-2-1

Browse Source 
Correction for circular reference bug in wrapper
This commit is contained in:
Cameron
2016-12-05 20:31:07 -08:00
committed by GitHub
parent 9c15e293d0 c60ba129f4
commit 57c5308ceb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
e107_handlers/shortcode_handler.php
View File

@@ -1295,8 +1295,11 @@ class e_parse_shortcode
if (isset($ret) && ($ret != '' || is_numeric($ret)))
{
$ret = $this->makeEditable($ret, $code);
if (!$this->nowrap == $code)
{
$ret = $this->makeWrapper($ret, $code, $fullShortcodeKey, $sc_mode);
}
}
if (E107_DBG_SC || E107_DBG_TIMEDETAILS)
@@ -1416,11 +1419,13 @@ class e_parse_shortcode
if(strpos($pre, '{') !== false) // shortcode found in wrapper
{
$this->nowrap = $code;
$pre = $this->parseCodes($pre, true, $this->addedCodes);
}
if(strpos($post, '{') !== false) // shortcode found in wrapper
{
$this->nowrap = $code;
$post = $this->parseCodes($post, true, $this->addedCodes);
}