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

Issue #4471

Browse Source
This commit is contained in:
Cameron
2021-04-06 18:41:15 -07:00
parent 920a881898
commit 2862e18db9
6 changed files with 806 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,7 +114,9 @@ TEMPL;
public function toHTML($content)
{
$tp = e107::getParser();
// XXX @Cam possible fix - convert to BB first, see news admin AJAX request/response values for reference why
$fa = e107::getTheme()->getFontAwesome(); // get the frontend theme's fontawesome version.
$tp->setFontAwesome($fa);
$content = stripslashes($content);
// $content = e107::getBB()->htmltoBBcode($content); //XXX This breaks inserted images from media-manager. :/

6
e107_plugins/tinymce4/wysiwyg_class.php
View File

@@ -943,12 +943,12 @@ class wysiwyg
/**
* @return array
*/
public function getEditorCSS()
public function getEditorCSS($theme = 'front')
{
$tp = e107::getParser();
$libraries = e107::getTheme('admin')->getThemeFiles('library', 'wysiwyg');
$libraries = e107::getTheme($theme)->getThemeFiles('library', 'wysiwyg');
$ret = [];
@@ -967,7 +967,7 @@ class wysiwyg
if($useThemeStyle)
{
$theme = e107::getTheme()->getThemeFiles('css', 'wysiwyg');
$theme = e107::getTheme($theme)->getThemeFiles('css', 'wysiwyg');
if(!empty($theme['css']))
{
foreach($theme['css'] as $path)