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 "Chinese Conversion Table Update 2017-6"
[lhc/web/wiklou.git]
/
includes
/
context
/
RequestContext.php
diff --git
a/includes/context/RequestContext.php
b/includes/context/RequestContext.php
index
4a772ee
..
47d1684
100644
(file)
--- a/
includes/context/RequestContext.php
+++ b/
includes/context/RequestContext.php
@@
-22,7
+22,6
@@
* @file
*/
* @file
*/
-use Liuggio\StatsdClient\Factory\StatsdDataFactory;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use Wikimedia\ScopedCallback;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use Wikimedia\ScopedCallback;
@@
-82,17
+81,13
@@
class RequestContext implements IContextSource, MutableContext {
private static $instance = null;
/**
private static $instance = null;
/**
- * Set the Config object
- *
- * @param Config $c
+ * @param Config $config
*/
*/
- public function setConfig( Config $c ) {
- $this->config = $c;
+ public function setConfig( Config $c
onfig
) {
+ $this->config = $c
onfig
;
}
/**
}
/**
- * Get the Config object
- *
* @return Config
*/
public function getConfig() {
* @return Config
*/
public function getConfig() {
@@
-309,7
+304,6
@@
class RequestContext implements IContextSource, MutableContext {
# Validate $code
if ( !$code || !Language::isValidCode( $code ) || $code === 'qqq' ) {
# Validate $code
if ( !$code || !Language::isValidCode( $code ) || $code === 'qqq' ) {
- wfDebug( "Invalid user language code\n" );
$code = $wgLanguageCode;
}
$code = $wgLanguageCode;
}
@@
-443,8
+437,6
@@
class RequestContext implements IContextSource, MutableContext {
return $this->skin;
}
return $this->skin;
}
- /** Helpful methods **/
-
/**
* Get a Message object with context set
* Parameters are the same as wfMessage()
/**
* Get a Message object with context set
* Parameters are the same as wfMessage()
@@
-460,8
+452,6
@@
class RequestContext implements IContextSource, MutableContext {
return call_user_func_array( 'wfMessage', $args )->setContext( $this );
}
return call_user_func_array( 'wfMessage', $args )->setContext( $this );
}
- /** Static methods **/
-
/**
* Get the RequestContext object associated with the main request
*
/**
* Get the RequestContext object associated with the main request
*