r80406 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r80405‎ \| r80406 \| r80407 >
Date:	21:59, 15 January 2011
Author:	bawolff
Status:	ok (Comments)
Tags:
Comment:	(bug 26729) Categories that do not have a page, and have no members, should return 404 Previously, a category returned 404, only if it had no content page, had no members, and never had any members (aka there was no entry in the category table for it). As before, if you're editing the category page, its still considered a 200.
Modified paths:	/trunk/phase3/RELEASE-NOTES (modified) (history) /trunk/phase3/includes/CategoryPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/CategoryPage.php
—	—	@@ -44,14 +44,23 @@
45	45
46	46	/**
47	47	* Don't return a 404 for categories in use.
	48	+ * In use defined as: either the actual page exists
	49	+ * or the category currently has members.
48	50	*/
49	51	function hasViewableContent() {
50	52	if ( parent::hasViewableContent() ) {
51	53	return true;
52	54	} else {
53	55	$cat = Category::newFromTitle( $this->mTitle );
54		~~- return $cat->getId() != 0;~~
	56	+ // If any of these are not 0, then has members
	57	+ if ( $cat->getPageCount()
	58	+ \|\| $cat->getSubcatCount()
	59	+ \|\| $cat->getFileCount()
	60	+ ) {
	61	+ return true;
	62	+ }
55	63	}
	64	+ return false;
56	65	}
57	66
58	67	function openShowCategory() {
Index: trunk/phase3/RELEASE-NOTES
—	—	@@ -80,6 +80,8 @@
81	81	* (bug 10158) Do not mention allowing others to contact you when the feature
82	82	is disabled ($wgEnableUserEmail=false)
83	83	* (bug 26733) Wrap initial table creation in transaction
	84	+* (bug 26729) Category pages should return 404 if they do not exist and have no
	85	+ members.
84	86
85	87	=== API changes in 1.18 ===
86	88	* (bug 26339) Throw warning when truncating an overlarge API result

User	Flag	Date
Reedy	inspected	21:37, 26 April 2011
Reedy	tested	21:37, 26 April 2011

Revision	Commit summary	Author	Date
r86988	MFT r80406	reedy	21:19, 26 April 2011
r86989	MFT r80406	reedy	21:43, 26 April 2011

#Comment by Brion VIBBER (talk | contribs) 21:10, 26 April 2011

Marking for merge to 1.17 -- this fix helps get spammy categories removed from Google search index & cache results.

21:43, 26 April 2011 Reedy (talk | contribs) changed the tags for r80406 [removed: 1.17,1.17-wmf]
21:10, 26 April 2011 Brion VIBBER (talk | contribs) changed the tags for r80406 [added: 1.17,1.17-wmf]
21:10, 26 April 2011 Brion VIBBER (talk | contribs) changed the status of r80406 [removed: new added: ok]