dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Support uploads with UTF-8 names on Windows"
[lhc/web/wiklou.git]
/
includes
/
Status.php
diff --git
a/includes/Status.php
b/includes/Status.php
index
07828fe
..
5456ed0
100644
(file)
--- a/
includes/Status.php
+++ b/
includes/Status.php
@@
-113,7
+113,7
@@
class Status extends StatusValue {
* 1 => object(Status) # The Status with warning messages, only
* ]
*
* 1 => object(Status) # The Status with warning messages, only
* ]
*
- * @return
array
+ * @return
Status[]
*/
public function splitByErrorType() {
list( $errorsOnlyStatus, $warningsOnlyStatus ) = parent::splitByErrorType();
*/
public function splitByErrorType() {
list( $errorsOnlyStatus, $warningsOnlyStatus ) = parent::splitByErrorType();
@@
-153,12
+153,9
@@
class Status extends StatusValue {
* @return Language
*/
protected function languageFromParam( $lang ) {
* @return Language
*/
protected function languageFromParam( $lang ) {
- global $wgLang;
-
if ( $lang === null ) {
if ( $lang === null ) {
- // @todo: Use RequestContext::getMain()->getLanguage() instead
- return $wgLang;
- } elseif ( $lang instanceof Language || $lang instanceof StubUserLang ) {
+ return RequestContext::getMain()->getLanguage();
+ } elseif ( $lang instanceof Language ) {
return $lang;
} else {
return Language::factory( $lang );
return $lang;
} else {
return Language::factory( $lang );