From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 13 May 2008 03:59:42 +0000 (+0000)
Subject: * Fix undefined variable error
X-Git-Tag: 1.31.0-rc.0~47683
X-Git-Url: https://git.cyclocoop.org/admin/%7B%7Blocalurl:Special:UserLogin%7D%7D?a=commitdiff_plain;h=86efd5a765f44fa822ca81166377df9b2646b32c;p=lhc%2Fweb%2Fwiklou.git

* Fix undefined variable error
* Clean up query stuff
---

diff --git a/includes/SpecialNewpages.php b/includes/SpecialNewpages.php
index dcda205840..5cc0fcdee1 100644
--- a/includes/SpecialNewpages.php
+++ b/includes/SpecialNewpages.php
@@ -138,7 +138,7 @@ class NewPagesForm {
 			unset($hidelinks['hideliu']);
 
 		if ( $wgUser->useNPPatrol() )
-			unset($hidelinks['hidepatrolled']);
+			unset($filters['hidepatrolled']);
 
 		$links = array();
 		$changed = $this->opts->getChangedValues();
@@ -386,12 +386,13 @@ class NewPagesPager extends ReverseChronologicalPager {
 		}
 		$conds[] = 'page_id = rc_cur_id';
 		$conds['page_is_redirect'] = 0;
-
-		# If anons cannot make new pages, don't query for it!
-		if( $wgGroupPermissions['*']['createpage'] && $this->opts->getValue( 'hideliu' ) ) {
-			$conds['rc_user'] = 0;
-		} elseif ( $user ) {
+		# $wgEnableNewpagesUserFilter - temp WMF hack
+		if( $wgEnableNewpagesUserFilter && $user ) {
 			$conds['rc_user_text'] = $user->getText();
+			$rcIndexes = 'rc_user_text';
+		# If anons cannot make new pages, don't "exclude logged in users"!
+		} elseif( $wgGroupPermissions['*']['createpage'] && $this->opts->getValue( 'hideliu' ) ) {
+			$conds['rc_user'] = 0;
 		}
 		# If this user cannot see patrolled edits or they are off, don't do dumb queries!
 		if( $this->opts->getValue( 'hidepatrolled' ) && $wgUser->useNPPatrol() ) {
@@ -400,11 +401,6 @@ class NewPagesPager extends ReverseChronologicalPager {
 		if( $this->opts->getValue( 'hidebots' ) ) {
 			$conds['rc_bot'] = 0;
 		}
-		# $wgEnableNewpagesUserFilter - temp WMF hack
-		if( $wgEnableNewpagesUserFilter && $user ) {
-			$conds['rc_user_text'] = $user->getText();
-			$rcIndexes = 'rc_user_text';
-		}
 
 		return array(
 			'tables' => array( 'recentchanges', 'page' ),