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

Fixes #4706 'quote' bbcode in TinyMce and fixes fatal error under PHP 8.1 (LAN_WROTE)

Browse Source
This commit is contained in:
Cameron
2022-03-29 13:59:25 -07:00
parent 0c14d6d3f5
commit f922456a8f
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_core/bbcodes/quote.bb
View File

@@ -1,13 +1,10 @@
//<? //<?
$class = e107::getBB()->getClass('quote'); $class = e107::getBB()->getClass('quote');
e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/lan_parser_functions.php"); e107::includeLan(e_LANGUAGEDIR.e_LANGUAGE."/".e_LANGUAGE.".php");
if(deftrue('BOOTSTRAP')) if(deftrue('BOOTSTRAP'))
{ {
return '<blockquote> return '<blockquote><p>'.$code_text.'</p><small><cite title="'.$parm.'">'.$parm.'</cite></small></blockquote>';
<p>'.$code_text.'</p>
<small><cite title="'.$parm.'">'.$parm.'</cite></small>
</blockquote>';
} }
return "<div class='indent {$class}'><em>$parm ".LAN_WROTE."</em> ...<br />$code_text</div>"; return "<div class='indent {$class}'><em>$parm ".LAN_WROTE."</em> ...<br />$code_text</div>";

5
e107_plugins/tinymce4/plugins/e107/parser.php
View File

@@ -117,6 +117,11 @@ TEMPL;
$fa = e107::getTheme()->getFontAwesome(); // get the frontend theme's fontawesome version. $fa = e107::getTheme()->getFontAwesome(); // get the frontend theme's fontawesome version.
$tp->setFontAwesome($fa); $tp->setFontAwesome($fa);
if(!defined('BOOTSTRAP') && ($bs = e107::getTheme()->getLibVersion('bootstrap')))
{
define('BOOTSTRAP', (int) $bs);
}
$content = stripslashes($content); $content = stripslashes($content);
// $content = e107::getBB()->htmltoBBcode($content); //XXX This breaks inserted images from media-manager. :/ // $content = e107::getBB()->htmltoBBcode($content); //XXX This breaks inserted images from media-manager. :/

2
e107_tests/tests/unit/e_bbcodeTest.php
View File

@@ -215,6 +215,8 @@
), ),
'quote' => 'quote' =>
array ( array (
'Ted' => array('input'=>'Quoted Message', 'expected'=>'<blockquote><p>Quoted Message</p><small><cite title="Ted">Ted</cite></small></blockquote>'),
), ),
'right' => 'right' =>
array ( array (