(bug 26716, well partially anyways. kind of second half of r80608) Add a comment...

what it is. This will give people who accidently select the preference a fighting chance to debug what is going on.

Of course, since it has a mime type of application/x-external-edit (or something like that), and the download would have
a .php extension, the chance they will open it in a text editor is pretty slim...

See bug 2760 for proposal to just kill the preference altogether.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5cba9de..59f1547 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -99,7 +99,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   adding overflow:hidden to h1,h2,h3,h4,h5,h6 (also fixes editsection bunching).
 * (bug 26708) Remove background-color:white from tables in Monobook and Vector.
 * (bug 26781) {{PAGENAME}} and related parser functions escape their output better.
-* (bug 26716) Provide link to instructions for external editor related preferences.
+* (bug 26716) Provide link to instructions for external editor related preferences
+  and add a comment to the ini control file explaining what is going on.
 
 === API changes in 1.18 ===
 * (bug 26339) Throw warning when truncating an overlarge API result

diff --git a/includes/ExternalEdit.php b/includes/ExternalEdit.php
index cfdd559..7109c1a 100644 (file)
--- a/includes/ExternalEdit.php
+++ b/includes/ExternalEdit.php
@@ -53,6 +53,11 @@ class ExternalEdit {
                }
                $special=$wgLang->getNsText(NS_SPECIAL);
                $control = <<<CONTROL
+; You're seeing this file because you're using Mediawiki's External Editor
+; feature. This is probably because you selected use external editor
+; in your preferences. To edit normally, either disable that preference
+; or go to the URL $url .
+; See http://www.mediawiki.org/wiki/Manual:External_editors for details.
 [Process]
 Type=$type
 Engine=MediaWiki