* (bug 20494) OutputPage::getArticleBodyOnly() no longer requires an useless argument

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

diff --git a/includes/ExternalEdit.php b/includes/ExternalEdit.php
index 02f14c3..1c58f44 100644 (file)
--- a/includes/ExternalEdit.php
+++ b/includes/ExternalEdit.php
@@ -3,13 +3,9 @@
  * License: Public domain
  *
  * @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'
@@ -22,42 +18,38 @@
 
 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 $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
                        # highlighting, so we follow that convention
                        $extension="wiki";
                } elseif($this->mMode=="file") {
                        $type="Edit file";
-                       $image = Image::newFromTitle( $this->mTitle );
-                       $img_url = $image->getURL();
-                       if(strpos($img_url,"://")) {
-                               $url = $img_url;
-                       } else {
-                               $url = $wgServer . $img_url;
-                       }
+                       $image = wfLocalFile( $this->mTitle );
+                       $url = $image->getFullURL();
                        $extension=substr($name, $pos);
                }
-               $special=$wgLang->getNsText(NS_SPECIAL);                
+               $special=$wgLang->getNsText(NS_SPECIAL);
                $control = <<<CONTROL
 [Process]
 Type=$type
@@ -74,4 +66,3 @@ CONTROL;
                echo $control;
        }
 }
-?>