X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FArticle.php;h=3bb1563f7a92cd5c8c80af8803b54c110e041377;hb=7da87ba445c838e6fadd458bf096d2652ec317e8;hp=e73fe9d64001446411a7d4bf9cfcbbe1718880c7;hpb=280cb03b4d87e864a723686daf5d1699b3566ec1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Article.php b/includes/Article.php
index e73fe9d640..3bb1563f7a 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -386,6 +386,11 @@ class Article implements Page {
 
 		$content = $this->fetchContentObject();
 
+		if ( !$content ) {
+			wfProfileOut( __METHOD__ );
+			return false;
+		}
+
 		// @todo Get rid of mContent everywhere!
 		$this->mContent = ContentHandler::getContentText( $content );
 		ContentHandler::runLegacyHooks( 'ArticleAfterFetchContent', array( &$this, &$this->mContent ) );
@@ -827,8 +832,9 @@ class Article implements Page {
 	 * Show a page view for a page formatted as CSS or JavaScript. To be called by
 	 * Article::view() only.
 	 *
-	 * This is hooked by SyntaxHighlight_GeSHi to do syntax highlighting of these
-	 * page views.
+	 * This exists mostly to serve the deprecated ShowRawCssJs hook (used to customize these views).
+	 * It has been replaced by the ContentGetParserOutput hook, which lets you do the same but with
+	 * more flexibility.
 	 *
 	 * @param bool $showCacheHint Whether to show a message telling the user
 	 *   to clear the browser cache (default: true).