diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /plugins/emoticons | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'plugins/emoticons')
| -rw-r--r-- | plugins/emoticons/emoticons.php | 4 |
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)); } } |