Fix missing emoticons on html-to-text conversion

pull/324/head
Aleksander Machniak 9 years ago
parent f915d15c43
commit d66793f0af

@ -1,7 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Fix missing emoticons on html-to-text conversion
- Fix random "access to this resource is secured against CSRF" message at logout (#1490641) - Fix random "access to this resource is secured against CSRF" message at logout (#1490641)
- Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634) - Fix missing language name in "Add to Dictionary" request in HTML mode (#1490634)
- Enable use of TLSv1.1 and TLSv1.2 for IMAP (#1490640) - Enable use of TLSv1.1 and TLSv1.2 for IMAP (#1490640)

@ -1926,7 +1926,8 @@ class rcmail extends rcube
foreach ($emoticons as $idx => $file) { foreach ($emoticons as $idx => $file) {
// <img title="Cry" src="http://.../program/js/tinymce/plugins/emoticons/img/smiley-cry.gif" border="0" alt="Cry" /> // <img title="Cry" src="http://.../program/js/tinymce/plugins/emoticons/img/smiley-cry.gif" border="0" alt="Cry" />
$search[] = '/<img title="[a-z ]+" src="https?:\/\/[a-z0-9_.\/-]+\/tinymce\/plugins\/emoticons\/img\/'.$file.'.gif"[^>]+\/>/i'; $file = preg_quote('program/js/tinymce/plugins/emoticons/img/' . $file . '.gif', '/');
$search[] = '/<img (title="[a-z ]+" )?src="[^"]+' . $file . '"[^>]+\/>/i';
$replace[] = $idx; $replace[] = $idx;
} }

Loading…
Cancel
Save