| Index: trunk/phase3/CREDITS |
| — | — | @@ -11,6 +11,7 @@ |
| 12 | 12 | * Daniel Friesen |
| 13 | 13 | * Greg Sabino Mullane |
| 14 | 14 | * Hojjat |
| | 15 | +* Leon Weber |
| 15 | 16 | * Mohamed Magdy |
| 16 | 17 | * Raimond Spekking |
| 17 | 18 | * Roan Kattouw |
| — | — | @@ -20,8 +21,9 @@ |
| 21 | 22 | * Tim Starling |
| 22 | 23 | |
| 23 | 24 | == Patch Contributors == |
| | 25 | +* Daniel Arnold |
| | 26 | +* Max Semenik |
| 24 | 27 | * RememberTheDot |
| 25 | | -* Max Semenik |
| 26 | 28 | |
| 27 | 29 | == Translators == |
| 28 | 30 | * Anders Wegge Jakobsen |
| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -4831,12 +4831,14 @@ |
| 4832 | 4832 | * @return string |
| 4833 | 4833 | */ |
| 4834 | 4834 | public function getDefaultSort() { |
| | 4835 | + global $wgCategoryPrefixedDefaultSortkey; |
| 4835 | 4836 | if( $this->mDefaultSort !== false ) { |
| 4836 | 4837 | return $this->mDefaultSort; |
| | 4838 | + } elseif ($this->mTitle->getNamespace() == NS_CATEGORY || |
| | 4839 | + !$wgCategoryPrefixedDefaultSortkey) { |
| | 4840 | + return $this->mTitle->getText(); |
| 4837 | 4841 | } else { |
| 4838 | | - return $this->mTitle->getNamespace() == NS_CATEGORY |
| 4839 | | - ? $this->mTitle->getText() |
| 4840 | | - : $this->mTitle->getPrefixedText(); |
| | 4842 | + return $this->mTitle->getPrefixedText(); |
| 4841 | 4843 | } |
| 4842 | 4844 | } |
| 4843 | 4845 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2481,6 +2481,12 @@ |
| 2482 | 2482 | $wgCategoryPagingLimit = 200; |
| 2483 | 2483 | |
| 2484 | 2484 | /** |
| | 2485 | + * Should the default category sortkey be the prefixed title? |
| | 2486 | + * Run maintenance/refreshLinks.php after changing this. |
| | 2487 | + */ |
| | 2488 | +$wgCategoryPrefixedDefaultSortkey = true; |
| | 2489 | + |
| | 2490 | +/** |
| 2485 | 2491 | * Browser Blacklist for unicode non compliant browsers |
| 2486 | 2492 | * Contains a list of regexps : "/regexp/" matching problematic browsers |
| 2487 | 2493 | */ |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -87,6 +87,8 @@ |
| 88 | 88 | in a div with class "templatesUsed" |
| 89 | 89 | * (bug 14868) Setting $wgFeedDiffCutoff to 0 now disables generation of the diff |
| 90 | 90 | entirely, not just the display of it. |
| | 91 | +* (bug 6387) Introduced new setting $wgCategoryPrefixedDefaultSortkey which |
| | 92 | + allows having the unprefixed page title as the default category sortkey |
| 91 | 93 | |
| 92 | 94 | === API changes in 1.14 === |
| 93 | 95 | |