[BUGFIX] RTE Find & replace plugin refers to deprecated function in TYPO3 4.6

this.base() is deprecated in 4.6.
Interim function also raises js error.

Change-Id: I75dbb7e1d9e91a5eb1d76b4fcd64151c115b381f
Fixes: #28818
Releases: 4.6
Reviewed-on: http://review.typo3.org/4208
Reviewed-by: Stanislas Rolland
Tested-by: Stanislas Rolland

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
index f9b6901..87aaafe 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
@@ -4166,8 +4166,8 @@ HTMLArea.Plugin = Ext.extend(HTMLArea.Plugin, {
         * Note: this.base will exclusively refer to the HTMLArea.Plugin class constructor
         */
        base: function (editor, pluginName) {
-               HTMLArea.appendToLog(editor.editorId, 'HTMLArea.' + pluginName, 'base', 'Deprecated use of base function. Use Ext superclass reference instead.', 'warn');
-               HTMLArea.Plugin.prototype.constructor.call(this, editor, pluginName);
+               HTMLArea.appendToLog(this.editor.editorId, 'HTMLArea.' + this.name, 'base', 'Deprecated use of base function. Use Ext superclass reference instead.', 'warn');
+               HTMLArea.Plugin.prototype.constructor.call(this, this.editor, this.name);
        },
        /**
         * Registers the plugin "About" information

diff --git a/typo3/sysext/rtehtmlarea/htmlarea/plugins/FindReplace/find-replace.js b/typo3/sysext/rtehtmlarea/htmlarea/plugins/FindReplace/find-replace.js
index a4f1441..86593fb 100644 (file)
--- a/typo3/sysext/rtehtmlarea/htmlarea/plugins/FindReplace/find-replace.js
+++ b/typo3/sysext/rtehtmlarea/htmlarea/plugins/FindReplace/find-replace.js
@@ -490,7 +490,7 @@ HTMLArea.FindReplace = Ext.extend(HTMLArea.Plugin, {
                if (plugin) {
                        plugin.start();
                }
-               this.base();
+               HTMLArea.FindReplace.superclass.onCancel.call(this);
        },
        /*
         * Clear the document before leaving on window close handle
@@ -501,6 +501,6 @@ HTMLArea.FindReplace = Ext.extend(HTMLArea.Plugin, {
                if (plugin) {
                        plugin.start();
                }
-               this.base();
+               HTMLArea.FindReplace.superclass.onClose.call(this);
        }
 });