From f3137e5b2b8071bce794f1f7a105c575f09e1492 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Tue, 17 Apr 2012 14:42:57 +1200
Subject: [PATCH] BUGFIX Fixed regression where image and link popups don't
 open

---
 thirdparty/tinymce_ssbuttons/editor_plugin_src.js | 10 +++++-----
 thirdparty/tinymce_ssmacron/editor_plugin_src.js  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/thirdparty/tinymce_ssbuttons/editor_plugin_src.js b/thirdparty/tinymce_ssbuttons/editor_plugin_src.js
index 699f5f9e0..195972305 100644
--- a/thirdparty/tinymce_ssbuttons/editor_plugin_src.js
+++ b/thirdparty/tinymce_ssbuttons/editor_plugin_src.js
@@ -31,12 +31,12 @@
 			ed.addButton('sslink', {title : ed.getLang('tinymce_ssbuttons.insertlink'), cmd : 'sslink', 'class' : 'mce_link'}); 
 			ed.addButton('ssimage', {title : ed.getLang('tinymce_ssbuttons.insertimage'), cmd : 'ssimage', 'class' : 'mce_image'}); 
 
-			ed.addCommand("sslink", function(ed) {
-				jQuery('#Form_EditorToolbarLinkForm').entwine('ss').open();
+			ed.addCommand('sslink', function(ed) {
+				jQuery('#' + this.id).entwine('ss').openLinkDialog();
 			});
 
-			ed.addCommand("ssimage", function(ed) {
-				jQuery('#Form_EditorToolbarMediaForm').entwine('ss').open();
+			ed.addCommand('ssimage', function(ed) {
+				jQuery('#' + this.id).entwine('ss').openMediaDialog();
 			});
 			
 			// Disable link button when no link is selected
@@ -49,4 +49,4 @@
 
 	// Adds the plugin class to the list of available TinyMCE plugins
 	tinymce.PluginManager.add("ssbuttons", tinymce.plugins.SSButtons);
-})();
\ No newline at end of file
+})();
diff --git a/thirdparty/tinymce_ssmacron/editor_plugin_src.js b/thirdparty/tinymce_ssmacron/editor_plugin_src.js
index 37ca34588..f14da99d4 100644
--- a/thirdparty/tinymce_ssmacron/editor_plugin_src.js
+++ b/thirdparty/tinymce_ssmacron/editor_plugin_src.js
@@ -29,7 +29,7 @@
 				}, {
 					plugin_url : url
 				});
-			})
+			});
 	
 			// Register buttons
 			ed.addButton('ssmacron', {