Revert r58635 and related, unnecessary and incorrect use of the hook mechanism

diff --git a/docs/hooks.txt b/docs/hooks.txt
index a74d4bc..2134993 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -552,11 +552,6 @@ $user: the user who did the block (not the one being blocked)
 'BookInformation': Before information output on Special:Booksources
 $isbn: ISBN to show information for
 $output: OutputPage object in use
-
-'CacheHeadersAfterSet': after cache headers have been set in 
-OutputPage::sendCacheControl, so they can be overridden without 
-disabling output method
-$out: OutputPage instance
  
 'CategoryPageView': before viewing a categorypage in CategoryPage::view
 $catpage: CategoryPage instance

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 872cd4f..ef8e3fd 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1401,7 +1401,6 @@ class OutputPage {
                        $response->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
                        $response->header( 'Pragma: no-cache' );
                }
-               wfRunHooks('CacheHeadersAfterSet', array( $this ) );
        }
 
        /**