From d19c6cc001ff790615f06e51656dae9eaa0d8e84 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 29 Sep 2008 23:02:52 +0000
Subject: [PATCH] Reverted r41301, r41332 -- weird overly-specific URL tweak
 setting for bug 15739.

---
 RELEASE-NOTES                | 2 --
 includes/DefaultSettings.php | 7 -------
 includes/Title.php           | 5 ++---
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b5c92fa263..8406fa1e5c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -140,8 +140,6 @@ The following extensions are migrated into MediaWiki 1.14:
   restriction types on the protection form.
 * (bug 8440) Allow preventing blocked users from editing their talk pages
 * Improved upload file type detection for OpenDocument formats
-* (bug 15739) Add $wgArticlePathForCurid to make links with only curid=# as the
-  query string use the article path, rather than the script path
 * Added the ability to set the target attribute on external links with 
   $wgExternalLinkTarget
 * (bug 674) Allow admins to block users from editing specific articles and
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f331d91b57..1a601896f2 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3455,10 +3455,3 @@ $wgUseAutomaticEditSummaries = true;
  * Requires memcached.
  */
 $wgPasswordAttemptThrottle = array( 'count' => 5, 'seconds' => 300 );
-
-/**
- * Allow using articlepath for links where the only querystring is a curid (e.g. use /wiki/Main_Page?curid=1)
- * WARNING: This will not work for all hosts or configuration setup, so BE CAREFUL.
- * Only use this setting if you have to, as it is not recommended.
- */
-$wgArticlePathForCurid = false;
diff --git a/includes/Title.php b/includes/Title.php
index 80ebdb1b53..0b0027b61e 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -714,7 +714,7 @@ class Title {
 	 */
 	public function getLocalURL( $query = '', $variant = false ) {
 		global $wgArticlePath, $wgScript, $wgServer, $wgRequest;
-		global $wgVariantArticlePath, $wgContLang, $wgUser, $wgArticlePathForCurid;
+		global $wgVariantArticlePath, $wgContLang, $wgUser;
 
 		if( is_array( $query ) ) {
 			$query = wfArrayToCGI( $query );
@@ -738,7 +738,7 @@ class Title {
 			}
 		} else {
 			$dbkey = wfUrlencode( $this->getPrefixedDBkey() );
-			if ( $query == '' || ($wgArticlePathForCurid && substr_count( $query, '&' ) == 0 && strpos( $query, 'curid=' ) === 0 ) ) {
+			if ( $query == '' ) {
 				if( $variant != false && $wgContLang->hasVariants() ) {
 					if( $wgVariantArticlePath == false ) {
 						$variantArticlePath =  "$wgScript?title=$1&variant=$2"; // default
@@ -750,7 +750,6 @@ class Title {
 				} else {
 					$url = str_replace( '$1', $dbkey, $wgArticlePath );
 				}
-				$url = wfAppendQuery( $url, $query );
 			} else {
 				global $wgActionPaths;
 				$url = false;
-- 
2.20.1