Follow-up r84814: revert redundant summary message addition.

[lhc/web/wiklou.git] / includes / ExternalEdit.php

diff --git a/includes/ExternalEdit.php b/includes/ExternalEdit.php
index d7c14bd..7109c1a 100644 (file)
--- a/includes/ExternalEdit.php
+++ b/includes/ExternalEdit.php
@@ -1,15 +1,14 @@
 <?php
 /**
+ * External editors support
+ *
  * License: Public domain
  *
+ * @file
  * @author Erik Moeller <moeller@scireview.de>
- * @package MediaWiki
  */
 
 /**
- * 
- * @package MediaWiki
- *
  * Support for external editors to modify both text and files
  * in external applications. It works as follows: MediaWiki
  * sends a meta-file with the MIME type 'application/x-external-editor'
@@ -19,42 +18,46 @@
  * and save the modified data back to the server.
  *
  */
- 
 class ExternalEdit {
 
-       function ExternalEdit ( $article, $mode ) {
+       function __construct( $article, $mode ) {
                global $wgInputEncoding;
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
                $this->mCharset = $wgInputEncoding;
                $this->mMode = $mode;
        }
-       
+
        function edit() {
-               global $wgUser, $wgOut, $wgScript, $wgScriptPath, $wgServer,
-                      $wgLang;
+               global $wgOut, $wgScript, $wgScriptPath, $wgServer, $wgLang;
                $wgOut->disable();
                $name=$this->mTitle->getText();
                $pos=strrpos($name,".")+1;
                header ( "Content-type: application/x-external-editor; charset=".$this->mCharset );
-               
+               header( "Cache-control: no-cache" );
+
                # $type can be "Edit text", "Edit file" or "Diff text" at the moment
                # See the protocol specifications at [[m:Help:External editors/Tech]] for
                # details.
-               if(!isset($this->mMode)) {              
-                       $type="Edit text";              
+               if(!isset($this->mMode)) {
+                       $type="Edit text";
                        $url=$this->mTitle->getFullURL("action=edit&internaledit=true");
-                       # *.wiki file extension is used by some editors for syntax 
+                       # *.wiki file extension is used by some editors for syntax
                        # highlighting, so we follow that convention
-                       $extension="wiki"; 
+                       $extension="wiki";
                } elseif($this->mMode=="file") {
-                       $type="Edit file"; 
-                       $image = Image::newFromTitle( $this->mTitle );
-                       $url = $wgServer . $image->getURL();
+                       $type="Edit file";
+                       $image = wfLocalFile( $this->mTitle );
+                       $url = $image->getFullURL();
                        $extension=substr($name, $pos);
                }
-               $special=$wgLang->getNsText(NS_SPECIAL);                 
+               $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
@@ -70,4 +73,3 @@ CONTROL;
                echo $control;
        }
 }
-?>