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 "rdbms: fix Sqlite::tableExists() method to avoid STATUS_TRX_ERROR"
[lhc/web/wiklou.git]
/
languages
/
LanguageConverter.php
diff --git
a/languages/LanguageConverter.php
b/languages/LanguageConverter.php
index
d11838a
..
ce35717
100644
(file)
--- a/
languages/LanguageConverter.php
+++ b/
languages/LanguageConverter.php
@@
-224,7
+224,7
@@
class LanguageConverter {
/**
* Get the variant specified in the URL
*
/**
* Get the variant specified in the URL
*
- * @return mixed Variant if one found,
false otherwise.
+ * @return mixed Variant if one found,
null otherwise
*/
public function getURLVariant() {
global $wgRequest;
*/
public function getURLVariant() {
global $wgRequest;
@@
-247,7
+247,7
@@
class LanguageConverter {
/**
* Determine if the user has a variant set.
*
/**
* Determine if the user has a variant set.
*
- * @return mixed Variant if one found,
false otherwise.
+ * @return mixed Variant if one found,
null otherwise
*/
protected function getUserVariant() {
global $wgUser, $wgContLang;
*/
protected function getUserVariant() {
global $wgUser, $wgContLang;
@@
-284,7
+284,7
@@
class LanguageConverter {
/**
* Determine the language variant from the Accept-Language header.
*
/**
* Determine the language variant from the Accept-Language header.
*
- * @return mixed Variant if one found,
false otherwise.
+ * @return mixed Variant if one found,
null otherwise
*/
protected function getHeaderVariant() {
global $wgRequest;
*/
protected function getHeaderVariant() {
global $wgRequest;