| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -1064,15 +1064,15 @@ |
| 1065 | 1065 | * Get the HTML text of the description page, if available |
| 1066 | 1066 | */ |
| 1067 | 1067 | function getDescriptionText() { |
| 1068 | | - global $wgMemc, $wgContLang; |
| | 1068 | + global $wgMemc, $wgLang; |
| 1069 | 1069 | if ( !$this->repo->fetchDescription ) { |
| 1070 | 1070 | return false; |
| 1071 | 1071 | } |
| 1072 | | - $renderUrl = $this->repo->getDescriptionRenderUrl( $this->getName(), $wgContLang->getCode() ); |
| | 1072 | + $renderUrl = $this->repo->getDescriptionRenderUrl( $this->getName(), $wgLang->getCode() ); |
| 1073 | 1073 | if ( $renderUrl ) { |
| 1074 | 1074 | if ( $this->repo->descriptionCacheExpiry > 0 ) { |
| 1075 | 1075 | wfDebug("Attempting to get the description from cache..."); |
| 1076 | | - $key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', 'url', $wgContLang->getCode(), |
| | 1076 | + $key = $this->repo->getLocalCacheKey( 'RemoteFileDescription', 'url', $wgLang->getCode(), |
| 1077 | 1077 | $this->getName() ); |
| 1078 | 1078 | $obj = $wgMemc->get($key); |
| 1079 | 1079 | if ($obj) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -363,7 +363,10 @@ |
| 364 | 364 | "editusercssjs" into "editusercss" and edituserjs" respectively. |
| 365 | 365 | * (bug 19394) RecentChanges feed URLs for log items with no revisions |
| 366 | 366 | (eg Newuser, Userrights) are no longer broken |
| | 367 | +* (bug 17395) Remote file descriptions use user language ($wgLang), not wiki |
| | 368 | + language ($wgContLang) |
| 367 | 369 | |
| | 370 | + |
| 368 | 371 | == API changes in 1.16 == |
| 369 | 372 | |
| 370 | 373 | * Added uiprop=changeablegroups to meta=userinfo |