From: Manuel Schneider <80686@users.mediawiki.org>
Date: Thu, 22 Mar 2007 08:19:47 +0000 (+0000)
Subject: fixed bug in call of hook ArticleViewHeader
X-Git-Tag: 1.31.0-rc.0~53645
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=d133a108c6e37a80e079988e86a621fb689d18ff;p=lhc%2Fweb%2Fwiklou.git

fixed bug in call of hook ArticleViewHeader
---

diff --git a/includes/Article.php b/includes/Article.php
index 3c8d10e094..3dd47a01b0 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -718,9 +718,9 @@ class Article {
 		}
 
 		$outputDone = false;
+		wfRunHooks( 'ArticleViewHeader', array( &$this ) );
 		if ( $pcache ) {
 			if ( $wgOut->tryParserCache( $this, $wgUser ) ) {
-				wfRunHooks( 'ArticleViewHeader', array( &$this ) );
 				$outputDone = true;
 			}
 		}
@@ -767,11 +767,6 @@ class Article {
 			}
 		}
 		if( !$outputDone ) {
-			/**
-			 * @fixme: this hook doesn't work most of the time, as it doesn't
-			 * trigger when the parser cache is used.
-			 */
-			wfRunHooks( 'ArticleViewHeader', array( &$this ) ) ;
 			$wgOut->setRevisionId( $this->getRevIdFetched() );
 			# wrap user css and user js in pre and don't parse
 			# XXX: use $this->mTitle->usCssJsSubpage() when php is fixed/ a workaround is found