| Index: branches/REL1_5/phase3/includes/EditPage.php |
| — | — | @@ -1009,7 +1009,7 @@ |
| 1010 | 1010 | * The necessary JavaScript code can be found in style/wikibits.js. |
| 1011 | 1011 | */ |
| 1012 | 1012 | function getEditToolbar() { |
| 1013 | | - global $wgStylePath, $wgLang, $wgMimeType, $wgJsMimeType; |
| | 1013 | + global $wgStylePath, $wgContLang, $wgMimeType, $wgJsMimeType; |
| 1014 | 1014 | |
| 1015 | 1015 | /** |
| 1016 | 1016 | * toolarray an array of arrays which each include the filename of |
| — | — | @@ -1059,14 +1059,14 @@ |
| 1060 | 1060 | 'key' => 'H' |
| 1061 | 1061 | ), |
| 1062 | 1062 | array( 'image'=>'button_image.png', |
| 1063 | | - 'open' => '[['.$wgLang->getNsText(NS_IMAGE).":", |
| | 1063 | + 'open' => '[['.$wgContLang->getNsText(NS_IMAGE).":", |
| 1064 | 1064 | 'close' => ']]', |
| 1065 | 1065 | 'sample'=> wfMsg('image_sample'), |
| 1066 | 1066 | 'tip' => wfMsg('image_tip'), |
| 1067 | 1067 | 'key' => 'D' |
| 1068 | 1068 | ), |
| 1069 | 1069 | array( 'image' =>'button_media.png', |
| 1070 | | - 'open' => '[['.$wgLang->getNsText(NS_MEDIA).':', |
| | 1070 | + 'open' => '[['.$wgContLang->getNsText(NS_MEDIA).':', |
| 1071 | 1071 | 'close' => ']]', |
| 1072 | 1072 | 'sample'=> wfMsg('media_sample'), |
| 1073 | 1073 | 'tip' => wfMsg('media_tip'), |
| Index: branches/REL1_5/phase3/RELEASE-NOTES |
| — | — | @@ -1009,6 +1009,7 @@ |
| 1010 | 1010 | |
| 1011 | 1011 | * (bug 4258) When installing under IIS, $wgArticlePath = "$wgScript?title=$1" should be set |
| 1012 | 1012 | * (bug 4510) Correct Barnes & Noble bookstore URLs |
| | 1013 | +* (bug 4504) Use site language for namespace name resolution |
| 1013 | 1014 | |
| 1014 | 1015 | === Caveats === |
| 1015 | 1016 | |