From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 19 Mar 2008 23:45:18 +0000 (+0000)
Subject: hopefully don't die on non-gallery-laden pages which trigger this consistency check
X-Git-Tag: 1.31.0-rc.0~48964
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=f3fc4bbf5dfed621988ecd21f31950cbf4f7d5d0;p=lhc%2Fweb%2Fwiklou.git

hopefully don't die on non-gallery-laden pages which trigger this consistency check
---

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 315d435a75..225898b797 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -484,7 +484,7 @@ class CategoryViewer {
 		#      know the right figure.
 		#   3) We have no idea.
 		$totalrescnt = count( $this->articles ) + count( $this->children ) +
-			$this->gallery->count();
+			($this->showGallery ? $this->gallery->count() : 0);
 		if($dbcnt == $rescnt || (($totalrescnt == $this->limit || $this->from
 		|| $this->until) && $dbcnt > $rescnt)){
 			# Case 1: seems sane.