mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 15:46:44 +02:00
Code Issues Releases Wiki Activity

Fixes shortcode wrapper conflict within the same template.

Browse Source
This commit is contained in:
Cameron
2021-01-04 07:47:40 -08:00
parent f20f00408c
commit 11c768d3c0
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_handlers/shortcode_handler.php
View File

@@ -823,21 +823,17 @@ class e_parse_shortcode
// Do it only once per parsing cylcle and not on every doCode() loop - performance
if(method_exists($this->addedCodes, 'wrapper'))
{
// $cname = get_class($this->addedCodes);
$tmpWrap = e107::templateWrapper($this->addedCodes->wrapper());
$this->wrapper = $this->addedCodes->getWrapperID();
if(!empty($tmpWrap)) // FIX for #3 above.
{
$this->wrappers = array_merge($this->wrappers,$tmpWrap);
$this->wrapper = $this->addedCodes->getWrapperID();
}
elseif(E107_DBG_BBSC)
elseif(!empty($this->wrapper)) // if there's a wrapper id but no wrappers assigned to it, clear the wrappers array.
{
$this->wrapper = $this->addedCodes->getWrapperID();
// e107::getMessage()->addDebug("Wrapper Empty: ".$this->addedCodes->wrapper());
$this->wrappers = array();
}
}
if(method_exists($this->addedCodes, 'editable'))