Revert r49669, r49670 "extract text layer from djvu file (see bug 18046)"

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

diff --git a/includes/Skin.php b/includes/Skin.php
index 7994ca2..79cf3f3 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -24,7 +24,8 @@ class Skin extends Linker {
        /**#@-*/
        protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
        protected $skinname = 'standard';
-       protected $mTitle = null;
+       // @fixme Should be protected :-\
+       var $mTitle = null;
 
        /** Constructor, call parent constructor */
        function Skin() { parent::__construct(); }
@@ -1012,10 +1013,13 @@ END;
        }
 
        function getUndeleteLink() {
-               global $wgUser, $wgContLang, $wgLang, $action;
-               if(     $wgUser->isAllowed( 'deletedhistory' ) &&
-                       ( ( $this->mTitle->getArticleId() == 0 ) || ( $action == 'history' ) ) &&
-                       ( $n = $this->mTitle->isDeleted() ) ){
+               global $wgUser, $wgContLang, $wgLang, $wgRequest;
+
+               $action = $wgRequest->getVal( 'action', 'view' );
+
+               if ( $wgUser->isAllowed( 'deletedhistory' ) &&
+                       ( $this->mTitle->getArticleId() == 0 || $action == 'history' ) &&
+                       $n = $this->mTitle->isDeleted() ) {
                        if ( $wgUser->isAllowed( 'undelete' ) ) {
                                $msg = 'thisisdeleted';
                        } else {
@@ -1926,4 +1930,4 @@ END;
                wfProfileOut( __METHOD__ );
                return $bar;
        }
-}
\ No newline at end of file
+}