mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

TinyMce: Fixes an issue where additional line-breaks were being added when converting to HTML.

Browse Source
This commit is contained in:
Cameron
2016-01-24 20:08:47 -08:00
parent 6290a7c958
commit a00acf6319
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/shortcode_handler.php
View File

@@ -798,7 +798,8 @@ class e_parse_shortcode
}
$ret = preg_replace_callback('#\{(\S[^\x02]*?\S)\}#', array(&$this, 'doCode'), $text);
$ret = preg_replace_callback('#\{([A-Z][^\x02]*?\S)\}#', array(&$this, 'doCode'), $text); // must always start with uppercase letter
// $ret = preg_replace_callback('#\{(\S[^\x02]*?\S)\}#', array(&$this, 'doCode'), $text);
$this->parseSCFiles = $saveParseSCFiles; // Restore previous value
$this->addedCodes = $saveCodes;
$this->eVars = $saveVars; // restore eVars
@@ -842,6 +843,7 @@ class e_parse_shortcode
return $matches[0];
}
if(preg_match('/^([A-Z_]*):(.*)/', $matches[1], $newMatch))
{
$fullShortcodeKey = $newMatch[0];