https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112181
Revision: 112181
Author: yaron
Date: 2012-02-23 02:04:56 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Renamed onArticleViewHeader() to setArticleHeader(), to be more descriptive;
fixed caching when $egApprovedRevsBlankIfUnapproved is set
Modified Paths:
--------------
trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php
trunk/extensions/ApprovedRevs/ApprovedRevs.php
Modified: trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php
===================================================================
--- trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php 2012-02-23
02:03:20 UTC (rev 112180)
+++ trunk/extensions/ApprovedRevs/ApprovedRevs.hooks.php 2012-02-23
02:04:56 UTC (rev 112181)
@@ -584,7 +584,7 @@
*
* @return true
*/
- public static function onArticleViewHeader( Article &$article,
&$outputDone, &$useParserCache ) {
+ public static function setArticleHeader( Article &$article,
&$outputDone, &$useParserCache ) {
global $wgOut, $wgRequest, $egApprovedRevsBlankIfUnapproved;
if ( ApprovedRevs::pageIsApprovable( $article->getTitle() )
@@ -594,6 +594,10 @@
if ( $egApprovedRevsBlankIfUnapproved &&
( empty( $approvedId ) || (
$wgRequest->getCheck( 'oldid' ) && $wgRequest->getInt( 'oldid' ) != $approvedId
) ) ) {
+ // Disable caching, so that if it's a specific
+ // ID being shown that happens to be the
+ // latest, it doesn't show a blank page.
+ $useParserCache = false;
$wgOut->addHTML( '<span
style="margin-left:10.75px">' );
if ( $wgRequest->getCheck( 'oldid' ) ) {
@@ -629,5 +633,4 @@
return true;
}
-
}
Modified: trunk/extensions/ApprovedRevs/ApprovedRevs.php
===================================================================
--- trunk/extensions/ApprovedRevs/ApprovedRevs.php 2012-02-23 02:03:20 UTC
(rev 112180)
+++ trunk/extensions/ApprovedRevs/ApprovedRevs.php 2012-02-23 02:04:56 UTC
(rev 112181)
@@ -64,7 +64,7 @@
$wgHooks['LoadExtensionSchemaUpdates'][] =
'ApprovedRevsHooks::describeDBSchema';
$wgHooks['EditPage::showEditForm:initial'][] =
'ApprovedRevsHooks::addWarningToEditPage';
$wgHooks['sfHTMLBeforeForm'][] = 'ApprovedRevsHooks::addWarningToSFForm';
-$wgHooks['ArticleViewHeader'][] = 'ApprovedRevsHooks::onArticleViewHeader';
+$wgHooks['ArticleViewHeader'][] = 'ApprovedRevsHooks::setArticleHeader';
// logging
$wgLogTypes['approval'] = 'approval';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
