mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

TinyMce Image align left/right parsing fix.

Browse Source
This commit is contained in:
Cameron 2018-08-22 08:12:32 -07:00
parent 1f69d7cd0a
commit 7e4f22c80d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/bbcode_handler.php
View File

@ -749,7 +749,7 @@ class e_bbcode
$cls = array();
foreach($tmp as $v)
{
if($v === 'img-rounded' || $v === 'rounded' || strpos($v,'bbcode') === 0 )
if($v === 'img-rounded' || $v === 'rounded' || (strpos($v,'bbcode') === 0 && $v !== 'bbcode-img-right' && $v !== 'bbcode-img-left' ))
{
continue;
}

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

@ -8,7 +8,7 @@
*/
if(empty($_POST['content']) && empty($_GET['debug']) && !defined('TINYMCE_DEBUG'))
if(empty($_POST['content']) && empty($_GET['debug']) && !defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST'))
{
header('Content-Length: 0');
exit;
@ -20,7 +20,7 @@ $_E107['no_forceuserupdate'] = true;
$_E107['no_maintenance'] = true;
define('e_ADMIN_AREA', true);
if(!defined('TINYMCE_DEBUG'))
if(!defined('TINYMCE_DEBUG') && !defined('TINYMCE_UNIT_TEST'))
{
require_once("../../../../class2.php");
}
@ -44,7 +44,7 @@ class e107TinyMceParser
{
$html = '';
if(defined('TINYMCE_DEBUG'))
if(defined('TINYMCE_DEBUG') || defined('TINYMCE_UNIT_TEST'))
{
$this->gzipCompression = false;
}