From: Rob Church <robchurch@users.mediawiki.org>
Date: Mon, 8 Jan 2007 16:31:52 +0000 (+0000)
Subject: Use Title::isContentPage() instead of a manual check
X-Git-Tag: 1.31.0-rc.0~54579
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=4725a8f7f28c153607dc6e439a222de8bb89db5c;p=lhc%2Fweb%2Fwiklou.git

Use Title::isContentPage() instead of a manual check
---

diff --git a/includes/Article.php b/includes/Article.php
index 6b4f527082..f36a674a12 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -471,12 +471,12 @@ class Article {
 	 * @return bool
 	 */
 	function isCountable( $text ) {
-		global $wgUseCommaCount, $wgContentNamespaces;
+		global $wgUseCommaCount;
 
 		$token = $wgUseCommaCount ? ',' : '[[';
 		return
-			array_search( $this->mTitle->getNamespace(), $wgContentNamespaces ) !== false
-			&& ! $this->isRedirect( $text )
+			$this->mTitle->isContentPage()
+			&& !$this->isRedirect( $text )
 			&& in_string( $token, $text );
 	}