Merge "Disable Special:PasswordReset when $wgEnableEmail is false"

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

diff --git a/includes/actions/ViewAction.php b/includes/actions/ViewAction.php
index d43e5fb..e227197 100644 (file)
--- a/includes/actions/ViewAction.php
+++ b/includes/actions/ViewAction.php
@@ -23,24 +23,24 @@
  * @author Timo Tijhof
  */
 
+/**
+ * An action that views article content
+ *
+ * This is a wrapper that will call Article::render().
+ *
+ * @ingroup Actions
+ */
 class ViewAction extends FormlessAction {
 
        public function getName() {
                return 'view';
        }
 
-       public function onView(){
+       public function onView() {
                return null;
        }
 
-       public function show(){
-               global $wgSquidMaxage;
-
-               $request = $this->getRequest();
-               if ( $request->getFullRequestURL() == $this->getTitle()->getInternalURL() ) {
-                       $this->getOutput()->setSquidMaxage( $wgSquidMaxage );
-               }
-
+       public function show() {
                $this->page->view();
        }