Merge "ResourceLoader: Test that all module dependencies are satisfiable"

[lhc/web/wiklou.git] / includes / actions / RawAction.php

diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index b753407..4baf7b9 100644 (file)
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -5,7 +5,7 @@
  * Copyright © 2004 Gabriel Wicke <wicke@wikidev.net>
  * http://wikidev.net/
  *
- * Based on HistoryPage and SpecialExport
+ * Based on HistoryAction and SpecialExport
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -125,7 +125,7 @@ class RawAction extends FormlessAction {
         * Get the text that should be returned, or false if the page or revision
         * was not found.
         *
-        * @return String|Bool
+        * @return string|bool
         */
        public function getRawText() {
                global $wgParser;
@@ -198,7 +198,7 @@ class RawAction extends FormlessAction {
        /**
         * Get the ID of the revision that should used to get the text.
         *
-        * @return Integer
+        * @return int
         */
        public function getOldId() {
                $oldid = $this->getRequest()->getInt( 'oldid' );
@@ -230,7 +230,7 @@ class RawAction extends FormlessAction {
        /**
         * Get the content type to use for the response
         *
-        * @return String
+        * @return string
         */
        public function getContentType() {
                $ctype = $this->getRequest()->getVal( 'ctype' );
@@ -252,40 +252,3 @@ class RawAction extends FormlessAction {
                return $ctype;
        }
 }
-
-/**
- * Backward compatibility for extensions
- *
- * @deprecated in 1.19
- */
-class RawPage extends RawAction {
-       public $mOldId;
-
-       /**
-        * @param Page $page
-        * @param WebRequest|bool $request The WebRequest (default: false).
-        */
-       function __construct( Page $page, $request = false ) {
-               wfDeprecated( __CLASS__, '1.19' );
-               parent::__construct( $page );
-
-               if ( $request !== false ) {
-                       $context = new DerivativeContext( $this->getContext() );
-                       $context->setRequest( $request );
-                       $this->context = $context;
-               }
-       }
-
-       public function view() {
-               $this->onView();
-       }
-
-       public function getOldId() {
-               # Some extensions like to set $mOldId
-               if ( $this->mOldId !== null ) {
-                       return $this->mOldId;
-               }
-
-               return parent::getOldId();
-       }
-}