From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Wed, 20 Apr 2011 15:26:05 +0000 (+0000)
Subject: Follow-up r86407: missed a file (and some random documentation); I'm surprised it... 
X-Git-Tag: 1.31.0-rc.0~30680
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=98a3b30feb8ee4f6a6653321a1d0d78b1931176c;p=lhc%2Fweb%2Fwiklou.git

Follow-up r86407: missed a file (and some random documentation); I'm surprised it worked without it.
---

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 0da2956442..ebe3001817 100644
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -414,25 +414,7 @@ class SpecialPageFactory {
 		// Page exists, set the context
 		$page->setContext( $context );
 
-		// Check for redirect
 		if ( !$including ) {
-			if( $page instanceof SpecialRedirectToSpecial ){
-				$redirect = $page->getRedirect( $par );
-				$query = $page->getRedirectQuery();
-				if ( $redirect instanceof Title ) {
-					$url = $redirect->getFullUrl( $query );
-					$context->output->redirect( $url );
-					wfProfileOut( __METHOD__ );
-					return $redirect;
-				} elseif ( $redirect === true ) {
-					global $wgScript;
-					$url = $wgScript . '?' . wfArrayToCGI( $query );
-					$context->output->redirect( $url );
-					wfProfileOut( __METHOD__ );
-					return $redirect;
-				}
-			}
-
 			// Redirect to canonical alias for GET commands
 			// Not for POST, we'd lose the post data, so it's best to just distribute
 			// the request. Such POST requests are possible for old extensions that
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 1ce91ba44d..70e513c6ac 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1039,7 +1039,8 @@ abstract class DatabaseBase implements DatabaseType {
 	 *                         see DatabaseBase::makeSelectOptions code for list of supported stuff
 	 * @param $join_conds Array: Associative array of table join conditions (optional)
 	 *                           (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') )
-	 * @return mixed Database result resource (feed to DatabaseBase::fetchObject or whatever), or false on failure
+	 * @return ResultWrapper|Bool Database result resource (feed to DatabaseBase::fetchObject
+	 *     or whatever), or false on failure
 	 */
 	function select( $table, $vars, $conds = '', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) {
 		$sql = $this->selectSQLText( $table, $vars, $conds, $fname, $options, $join_conds );