| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -714,7 +714,7 @@ |
| 715 | 715 | */ |
| 716 | 716 | public function getLocalURL( $query = '', $variant = false ) { |
| 717 | 717 | global $wgArticlePath, $wgScript, $wgServer, $wgRequest; |
| 718 | | - global $wgVariantArticlePath, $wgContLang, $wgUser, $wgArticlePathForCurid; |
| | 718 | + global $wgVariantArticlePath, $wgContLang, $wgUser; |
| 719 | 719 | |
| 720 | 720 | if( is_array( $query ) ) { |
| 721 | 721 | $query = wfArrayToCGI( $query ); |
| — | — | @@ -738,7 +738,7 @@ |
| 739 | 739 | } |
| 740 | 740 | } else { |
| 741 | 741 | $dbkey = wfUrlencode( $this->getPrefixedDBkey() ); |
| 742 | | - if ( $query == '' || ($wgArticlePathForCurid && substr_count( $query, '&' ) == 0 && strpos( $query, 'curid=' ) === 0 ) ) { |
| | 742 | + if ( $query == '' ) { |
| 743 | 743 | if( $variant != false && $wgContLang->hasVariants() ) { |
| 744 | 744 | if( $wgVariantArticlePath == false ) { |
| 745 | 745 | $variantArticlePath = "$wgScript?title=$1&variant=$2"; // default |
| — | — | @@ -750,7 +750,6 @@ |
| 751 | 751 | } else { |
| 752 | 752 | $url = str_replace( '$1', $dbkey, $wgArticlePath ); |
| 753 | 753 | } |
| 754 | | - $url = wfAppendQuery( $url, $query ); |
| 755 | 754 | } else { |
| 756 | 755 | global $wgActionPaths; |
| 757 | 756 | $url = false; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3455,10 +3455,3 @@ |
| 3456 | 3456 | * Requires memcached. |
| 3457 | 3457 | */ |
| 3458 | 3458 | $wgPasswordAttemptThrottle = array( 'count' => 5, 'seconds' => 300 ); |
| 3459 | | - |
| 3460 | | -/** |
| 3461 | | - * Allow using articlepath for links where the only querystring is a curid (e.g. use /wiki/Main_Page?curid=1) |
| 3462 | | - * WARNING: This will not work for all hosts or configuration setup, so BE CAREFUL. |
| 3463 | | - * Only use this setting if you have to, as it is not recommended. |
| 3464 | | - */ |
| 3465 | | -$wgArticlePathForCurid = false; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -140,8 +140,6 @@ |
| 141 | 141 | restriction types on the protection form. |
| 142 | 142 | * (bug 8440) Allow preventing blocked users from editing their talk pages |
| 143 | 143 | * Improved upload file type detection for OpenDocument formats |
| 144 | | -* (bug 15739) Add $wgArticlePathForCurid to make links with only curid=# as the |
| 145 | | - query string use the article path, rather than the script path |
| 146 | 144 | * Added the ability to set the target attribute on external links with |
| 147 | 145 | $wgExternalLinkTarget |
| 148 | 146 | * (bug 674) Allow admins to block users from editing specific articles and |