| Index: branches/wmf/1.16wmf4/includes/Title.php |
| — | — | @@ -775,6 +775,9 @@ |
| 776 | 776 | $pref = $wgContLang->getPreferredVariant(false); |
| 777 | 777 | if($pref != $wgContLang->getCode()) |
| 778 | 778 | $variant = $pref; |
| | 779 | + } elseif ( $variant == $wgContLang->getCode() ) { |
| | 780 | + // Don't use $wgVariantArticlePath for the main code |
| | 781 | + $variant = false; |
| 779 | 782 | } |
| 780 | 783 | |
| 781 | 784 | if ( $this->isExternal() ) { |
| Property changes on: branches/wmf/1.16wmf4/includes/Title.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 782 | 785 | + /branches/REL1_15/phase3/includes/Title.php:51646 |
| /branches/sqlite/includes/Title.php:58211-58321 |
| /branches/wmf-deployment/includes/Title.php:53381,60970 |
| /trunk/phase3/includes/Title.php:63549,63764,63897-63901,64792 |