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

Forum: Fix for shortcode wrapping with 'viewforum' template.

Browse Source
This commit is contained in:
Cameron
2016-05-04 15:56:41 -07:00
parent ee77bb120b
commit 056e66530c
3 changed files with 121 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/shortcode_handler.php
View File

@@ -813,6 +813,14 @@ class e_parse_shortcode
{
$this->addedCodes = &$extraCodes;
if(isset($extraCodes['_WRAPPER_']))
{
$tmpWrap = e107::templateWrapper($extraCodes['_WRAPPER_']);
$this->wrappers = array_merge($this->wrappers,$tmpWrap);
$this->wrapper = $extraCodes['_WRAPPER_'];
unset($extraCodes['_WRAPPER_']);
}
/*
foreach ($extraCodes as $sc => $code)
{
@@ -1177,7 +1185,13 @@ class e_parse_shortcode
{
list($wrapTmpl, $wrapID1, $wrapID2) = explode('/',$this->wrapper,3);
$wrapActive = strtoupper($wrapTmpl)."_WRAPPER['".$wrapID1."']";
$wrapActive = strtoupper($wrapTmpl)."_WRAPPER";
if(!empty($wrapID1))
{
$wrapActive .= "['".$wrapID1."']";
}
if(!empty($wrapID2))
{
$wrapActive .= "['".$wrapID2."']";