Update auf 1.13.0

1 files changed, 96 insertions, 29 deletions

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 6fbcd3c1..92e4e279 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -66,10 +66,12 @@ class CategoryPage extends Article {
 
 class CategoryViewer {
 	var $title, $limit, $from, $until,
-		$articles, $articles_start_char, 
+		$articles, $articles_start_char,
 		$children, $children_start_char,
 		$showGallery, $gallery,
 		$skin;
+	/** Category object for this page */
+	private $cat;
 
 	function __construct( $title, $from = '', $until = '' ) {
 		global $wgCategoryPagingLimit;
@@ -77,8 +79,9 @@ class CategoryViewer {
 		$this->from = $from;
 		$this->until = $until;
 		$this->limit = $wgCategoryPagingLimit;
+		$this->cat = Category::newFromName( $title->getDBKey() );
 	}
-	
+
 	/**
 	 * Format the category data list.
 	 *
@@ -132,12 +135,21 @@ class CategoryViewer {
 	}
 
 	/**
-	 * Add a subcategory to the internal lists
+	 * Add a subcategory to the internal lists, using a Category object
+	 */
+	function addSubcategoryObject( $cat, $sortkey, $pageLength ) {
+		$title = $cat->getTitle();
+		$this->addSubcategory( $title, $sortkey, $pageLength );
+	}
+
+	/**
+	 * Add a subcategory to the internal lists, using a title object 
+	 * @deprectated kept for compatibility, please use addSubcategoryObject instead
 	 */
 	function addSubcategory( $title, $sortkey, $pageLength ) {
 		global $wgContLang;
 		// Subcategory; strip the 'Category' namespace from the link text.
-		$this->children[] = $this->getSkin()->makeKnownLinkObj( 
+		$this->children[] = $this->getSkin()->makeKnownLinkObj(
 			$title, $wgContLang->convertHtml( $title->getText() ) );
 
 		$this->children_start_char[] = $this->getSubcategorySortChar( $title, $sortkey );
@@ -152,13 +164,13 @@ class CategoryViewer {
 	*/
 	function getSubcategorySortChar( $title, $sortkey ) {
 		global $wgContLang;
-		
+
 		if( $title->getPrefixedText() == $sortkey ) {
 			$firstChar = $wgContLang->firstChar( $title->getDBkey() );
 		} else {
 			$firstChar = $wgContLang->firstChar( $sortkey );
 		}
-		
+
 		return $wgContLang->convert( $firstChar );
 	}
 
@@ -167,11 +179,10 @@ class CategoryViewer {
 	 */
 	function addImage( Title $title, $sortkey, $pageLength, $isRedirect = false ) {
 		if ( $this->showGallery ) {
-			$image = new Image( $title );
 			if( $this->flip ) {
-				$this->gallery->insert( $image );
+				$this->gallery->insert( $title );
 			} else {
-				$this->gallery->add( $image );
+				$this->gallery->add( $title );
 			}
 		} else {
 			$this->addPage( $title, $sortkey, $pageLength, $isRedirect );
@@ -211,17 +222,17 @@ class CategoryViewer {
 			$this->flip = false;
 		}
 		$res = $dbr->select(
-			array( 'page', 'categorylinks' ),
-			array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey' ),
+			array( 'page', 'categorylinks', 'category' ),
+			array( 'page_title', 'page_namespace', 'page_len', 'page_is_redirect', 'cl_sortkey',
+				'cat_id', 'cat_title', 'cat_subcats', 'cat_pages', 'cat_files' ),
 			array( $pageCondition,
-			       'cl_from          =  page_id',
-			       'cl_to'           => $this->title->getDBkey()),
-			       #'page_is_redirect' => 0),
-			#+ $pageCondition,
+			       'cl_to' => $this->title->getDBkey() ),
 			__METHOD__,
 			array( 'ORDER BY' => $this->flip ? 'cl_sortkey DESC' : 'cl_sortkey',
-			       'USE INDEX' => 'cl_sortkey', 
-			       'LIMIT'    => $this->limit + 1 ) );
+			       'USE INDEX' => array( 'categorylinks' => 'cl_sortkey' ),
+			       'LIMIT'    => $this->limit + 1 ),
+			array( 'categorylinks'  => array( 'INNER JOIN', 'cl_from = page_id' ),
+		               'category' => array( 'LEFT JOIN', 'cat_title = page_title AND page_namespace = ' . NS_CATEGORY ) ) );
 
 		$count = 0;
 		$this->nextPage = null;
@@ -236,7 +247,8 @@ class CategoryViewer {
 			$title = Title::makeTitle( $x->page_namespace, $x->page_title );
 
 			if( $title->getNamespace() == NS_CATEGORY ) {
-				$this->addSubcategory( $title, $x->cl_sortkey, $x->page_len );
+				$cat = Category::newFromRow( $x, $title );
+				$this->addSubcategoryObject( $cat, $x->cl_sortkey, $x->page_len );
 			} elseif( $this->showGallery && $title->getNamespace() == NS_IMAGE ) {
 				$this->addImage( $title, $x->cl_sortkey, $x->page_len, $x->page_is_redirect );
 			} else {
@@ -261,12 +273,14 @@ class CategoryViewer {
 	function getSubcategorySection() {
 		# Don't show subcategories section if there are none.
 		$r = '';
-		$c = count( $this->children );
-		if( $c > 0 ) {
+		$rescnt = count( $this->children );
+		$dbcnt = $this->cat->getSubcatCount();
+		$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'subcat' );
+		if( $rescnt > 0 ) {
 			# Showing subcategories
 			$r .= "<div id=\"mw-subcategories\">\n";
 			$r .= '<h2>' . wfMsg( 'subcategories' ) . "</h2>\n";
-			$r .= wfMsgExt( 'subcategorycount', array( 'parse' ), $c );
+			$r .= $countmsg;
 			$r .= $this->formatList( $this->children, $this->children_start_char );
 			$r .= "\n</div>";
 		}
@@ -277,11 +291,20 @@ class CategoryViewer {
 		$ti = htmlspecialchars( $this->title->getText() );
 		# Don't show articles section if there are none.
 		$r = '';
-		$c = count( $this->articles );
-		if( $c > 0 ) {
+
+		# FIXME, here and in the other two sections: we don't need to bother
+		# with this rigamarole if the entire category contents fit on one page
+		# and have already been retrieved.  We can just use $rescnt in that
+		# case and save a query and some logic.
+		$dbcnt = $this->cat->getPageCount() - $this->cat->getSubcatCount()
+			- $this->cat->getFileCount();
+		$rescnt = count( $this->articles );
+		$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'article' );
+
+		if( $rescnt > 0 ) {
 			$r = "<div id=\"mw-pages\">\n";
 			$r .= '<h2>' . wfMsg( 'category_header', $ti ) . "</h2>\n";
-			$r .= wfMsgExt( 'categoryarticlecount', array( 'parse' ), $c );
+			$r .= $countmsg;
 			$r .= $this->formatList( $this->articles, $this->articles_start_char );
 			$r .= "\n</div>";
 		}
@@ -290,10 +313,13 @@ class CategoryViewer {
 
 	function getImageSection() {
 		if( $this->showGallery && ! $this->gallery->isEmpty() ) {
+			$dbcnt = $this->cat->getFileCount();
+			$rescnt = $this->gallery->count();
+			$countmsg = $this->getCountMessage( $rescnt, $dbcnt, 'file' );
+
 			return "<div id=\"mw-category-media\">\n" .
 			'<h2>' . wfMsg( 'category-media-header', htmlspecialchars($this->title->getText()) ) . "</h2>\n" .
-			wfMsgExt( 'category-media-count', array( 'parse' ), $this->gallery->count() ) .
-			$this->gallery->toHTML() . "\n</div>";
+			$countmsg . $this->gallery->toHTML() . "\n</div>";
 		} else {
 			return '';
 		}
@@ -440,7 +466,48 @@ class CategoryViewer {
 
 		return "($prevLink) ($nextLink)";
 	}
-}
-
-
 
+	/**
+	 * What to do if the category table conflicts with the number of results
+	 * returned?  This function says what.  It works the same whether the
+	 * things being counted are articles, subcategories, or files.
+	 *
+	 * Note for grepping: uses the messages category-article-count,
+	 * category-article-count-limited, category-subcat-count,
+	 * category-subcat-count-limited, category-file-count,
+	 * category-file-count-limited.
+	 *
+	 * @param int $rescnt The number of items returned by our database query.
+	 * @param int $dbcnt The number of items according to the category table.
+	 * @param string $type 'subcat', 'article', or 'file'
+	 * @return string A message giving the number of items, to output to HTML.
+	 */
+	private function getCountMessage( $rescnt, $dbcnt, $type ) {
+		global $wgLang;
+		# There are three cases:
+		#   1) The category table figure seems sane.  It might be wrong, but
+		#      we can't do anything about it if we don't recalculate it on ev-
+		#      ery category view.
+		#   2) The category table figure isn't sane, like it's smaller than the
+		#      number of actual results, *but* the number of results is less
+		#      than $this->limit and there's no offset.  In this case we still
+		#      know the right figure.
+		#   3) We have no idea.
+		$totalrescnt = count( $this->articles ) + count( $this->children ) +
+			($this->showGallery ? $this->gallery->count() : 0);
+		if($dbcnt == $rescnt || (($totalrescnt == $this->limit || $this->from
+		|| $this->until) && $dbcnt > $rescnt)){
+			# Case 1: seems sane.
+			$totalcnt = $dbcnt;
+		} elseif($totalrescnt < $this->limit && !$this->from && !$this->until){
+			# Case 2: not sane, but salvageable.
+			$totalcnt = $rescnt;
+		} else {
+			# Case 3: hopeless.  Don't give a total count at all.
+			return wfMsgExt("category-$type-count-limited", 'parse',
+				$wgLang->formatNum( $rescnt ) );
+		}
+		return wfMsgExt( "category-$type-count", 'parse', $wgLang->formatNum( $rescnt ),
+			$wgLang->formatNum( $totalcnt ) );
+	}
+}