summaryrefslogtreecommitdiff
path: root/plugins/emoticons/emoticons.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-05-28 15:52:30 +0200
committerAleksander Machniak <alec@alec.pl>2014-05-28 15:52:30 +0200
commit731d190fecb1976d845f6bd18768ee528b007232 (patch)
tree323c63555256ad7e5faa6a9d3c10f957295d0ce1 /plugins/emoticons/emoticons.php
parent586ed69aa8f9df34076f4e3bb5e1ecf0cfc6581a (diff)
parent8763170d224408bb01998d0a3393d2eacfc781ad (diff)
Merge branch 'tinymce4'
Conflicts: program/js/app.js program/js/editor.js program/js/tiny_mce/tiny_mce.js program/steps/utils/spell_html.inc
Diffstat (limited to 'plugins/emoticons/emoticons.php')
-rw-r--r--plugins/emoticons/emoticons.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
index c986686e3..187e83827 100644
--- a/plugins/emoticons/emoticons.php
+++ b/plugins/emoticons/emoticons.php
@@ -71,8 +71,8 @@ class emoticons extends rcube_plugin
}
private function img_tag($ico, $title)
- {
- $path = './program/js/tiny_mce/plugins/emotions/img/';
+ {
+ $path = './program/js/tinymce/plugins/emoticons/img/';
return html::img(array('src' => $path.$ico, 'title' => $title));
}
}