From cb554ed1369b18362cbb4ad87a1907a9b0405749 Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Fri, 13 Sep 2013 10:40:40 +0200
Subject: [PATCH] fixed wrong instance name for plain editor drop

---
 serendipity_event_emoticonchooser/ChangeLog          | 4 ++++
 serendipity_event_emoticonchooser/emoticonchooser.js | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/serendipity_event_emoticonchooser/ChangeLog b/serendipity_event_emoticonchooser/ChangeLog
index b9b63249..4159a5b6 100644
--- a/serendipity_event_emoticonchooser/ChangeLog
+++ b/serendipity_event_emoticonchooser/ChangeLog
@@ -1,3 +1,7 @@
+2.7:
+----
+fixed wrong instance name for plain editor drop
+
 2.6:
 ----
 outsourced main functions to emoticonchooser.js file
diff --git a/serendipity_event_emoticonchooser/emoticonchooser.js b/serendipity_event_emoticonchooser/emoticonchooser.js
index 0be8ee8c..0a8aa16a 100644
--- a/serendipity_event_emoticonchooser/emoticonchooser.js
+++ b/serendipity_event_emoticonchooser/emoticonchooser.js
@@ -50,7 +50,7 @@ function emoticonchooser(instance_name = '', this_instance = '', cke_txtarea = '
             tinyMCE.execInstanceCommand(this_instance, 'mceInsertContent', false, img);
         } else  {
             // default case: no wysiwyg editor
-            txtarea = document.getElementById(this_instance);
+            txtarea = document.getElementById(instance_name);
             if (txtarea.createTextRange && txtarea.caretPos) {
                 caretPos = txtarea.caretPos;
                 caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + ' ' + img + ' ' : caretPos.text + ' ' + img + ' ';