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

Fix for bbcode of 'code' being parsed as shortcodes.

Browse Source
This commit is contained in:
Cameron
2015-01-25 03:10:39 -08:00
parent f2e71589c7
commit 0d809d80dc
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_core/bbcodes/bb_code.php
View File

@@ -20,6 +20,11 @@ class bb_code extends e_bb_base
// $code_text = str_replace('<','&ltr;',$code_text); // $code_text = str_replace('<','&ltr;',$code_text);
$code_text = htmlentities($code_text, ENT_QUOTES, 'utf-8'); $code_text = htmlentities($code_text, ENT_QUOTES, 'utf-8');
// $srch = array('{','}');
// $repl = array( '&lbrace;', '&rbrace;'); // avoid code getting parsed as templates or shortcodes.
// $code_text = str_replace($srch, $repl, $code_text);
return $paramet ? '[code='.$paramet.']'.$code_text.'[/code]' : '[code]'.$code_text.'[/code]'; return $paramet ? '[code='.$paramet.']'.$code_text.'[/code]' : '[code]'.$code_text.'[/code]';
} }
@@ -50,6 +55,8 @@ class bb_code extends e_bb_base
$code_text = str_replace($search, $replace, $code_text); $code_text = str_replace($search, $replace, $code_text);
if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/geshi.php")) if(isset($pref['useGeshi']) && $pref['useGeshi'] && file_exists(e_PLUGIN."geshi/geshi.php"))
{ {
$code_md5 = md5($code_text); $code_md5 = md5($code_text);
@@ -80,6 +87,11 @@ class bb_code extends e_bb_base
$code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8'); $code_text = html_entity_decode($code_text, ENT_QUOTES, 'utf-8');
$code_text = trim($code_text); $code_text = trim($code_text);
$code_text = htmlspecialchars($code_text, ENT_QUOTES, 'utf-8'); $code_text = htmlspecialchars($code_text, ENT_QUOTES, 'utf-8');
$srch = array('{','}');
$repl = array('&lbrace;', '&rbrace;');
$code_text = str_replace($srch, $repl, $code_text); // avoid code getting parsed as templates or shortcodes.
if($parm == 'inline') if($parm == 'inline')
{ {
@@ -92,7 +104,10 @@ class bb_code extends e_bb_base
$ret = "<pre class='prettyprint linenums ".$tp -> toAttribute($divClass)." code-box {$class}' style='unicode-bidi: embed; direction: ltr'>".$code_text."</pre>"; $ret = "<pre class='prettyprint linenums ".$tp -> toAttribute($divClass)." code-box {$class}' style='unicode-bidi: embed; direction: ltr'>".$code_text."</pre>";
} }
$ret = str_replace("[", "&#091;", $ret); $ret = str_replace("[", "&#091;", $ret);
return $ret; return $ret;
} }