mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Fixes #1835, Fixes #1700 - Emoticons path issue. Also removed old icons not found in the emoticon pack.

Browse Source
This commit is contained in:
Cameron
2016-09-14 11:57:13 -07:00
parent b41797cc3f
commit fa385db40e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,7 @@ TEMPL;
foreach($arr['img'] as $img) foreach($arr['img'] as $img)
{ {
if(substr($img['src'],0,4) == 'http') if(substr($img['src'],0,4) == 'http' || strpos($img['src'], e_IMAGE_ABS.'emotes/')!==false) // dont resize external images or emoticons.
{ {
continue; continue;
} }

6
e107_plugins/tinymce4/plugins/smileys/plugin.js
View File

@@ -1,5 +1,5 @@
tinymce.PluginManager.add('smileys', function (editor, url) { tinymce.PluginManager.add('smileys', function (editor, url) {
var defaultSmileys = [ /*var defaultSmileys = [
[ [
{ shortcut: '(^^^)', url: url + '/img/shark.gif', title: 'shark' }, { shortcut: '(^^^)', url: url + '/img/shark.gif', title: 'shark' },
{ shortcut: 'O:)', url: url + '/img/angel.png', title: 'angel' }, { shortcut: 'O:)', url: url + '/img/angel.png', title: 'angel' },
@@ -27,7 +27,9 @@ tinymce.PluginManager.add('smileys', function (editor, url) {
{ shortcut: '>:O', url: url + '/img/upset.png', title: 'upset' }, { shortcut: '>:O', url: url + '/img/upset.png', title: 'upset' },
{ shortcut: '>:(', url: url + '/img/grumpy.png', title: 'grumpy' } { shortcut: '>:(', url: url + '/img/grumpy.png', title: 'grumpy' }
] ]
]; ];*/
var defaultSmileys = [];
var smileys = editor.settings.smileys || defaultSmileys, fullSmileysList = editor.settings.extended_smileys ? smileys.concat(editor.settings.extended_smileys) : smileys; var smileys = editor.settings.smileys || defaultSmileys, fullSmileysList = editor.settings.extended_smileys ? smileys.concat(editor.settings.extended_smileys) : smileys;

2
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -693,7 +693,7 @@ class wysiwyg
foreach($emo as $path=>$co) foreach($emo as $path=>$co)
{ {
$codes = explode(" ",$co); $codes = explode(" ",$co);
$url = SITEURLBASE.e_IMAGE_ABS."emotes/" . $pack . "/" . str_replace("!",".",$path); $url = e_IMAGE_ABS."emotes/" . $pack . "/" . str_replace("!",".",$path);
$emotes[$i][] = array('shortcut'=>$codes, 'url'=>$url, 'title'=>ucfirst($path)); $emotes[$i][] = array('shortcut'=>$codes, 'url'=>$url, 'title'=>ucfirst($path));
if($c == 6) if($c == 6)