[TWiki-Dev] [SVN] CrawfordCurrie r14547 - twiki/branches/MAIN/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins

[<de...@de...>]

Author: CrawfordCurrie
Date: 2007-08-13 11:09:08 -0500 (Mon, 13 Aug 2007)
New Revision: 14547

Modified:
   twiki/branches/MAIN/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm
Log:
Item4435: more refinement of the language used in debug messages, and newline handling

Modified: twiki/branches/MAIN/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm	2007-08-13 11:36:11 UTC (rev 14546)
+++ twiki/branches/MAIN/twikiplugins/TinyMCEPlugin/lib/TWiki/Plugins/TinyMCEPlugin.pm	2007-08-13 16:09:08 UTC (rev 14547)
@@ -36,10 +36,11 @@
 
     # Check the client browser to see if it is supported by TinyMCE
     my $query = TWiki::Func::getCgiQuery();
-    if ($query->user_agent() =~ /(Konqueror|Opera)/i) {
+    if ($query && $query->user_agent() &&
+          $query->user_agent() =~ /(Konqueror|Opera)/i) {
         $disabled = 1;
     }
-die "FUCKSHIT" if $disabled;
+
     return $disabled ? 0 : 1;
 }
 
@@ -87,7 +88,7 @@
         # if the wysiwyg plugin is enabled, we don't want to do anything
         # if wysiwyg_edit is enabled, as the WysiwygPlugin afterEditHandler
         # will deal with it.
-        $query->param( 'wysiwyg_edit' );
+        return if ($query->param( 'wysiwyg_edit' ));
         # otherwise wysiwygplugin isn't going to do anything, so we can
         # post-process.
     }