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 "RequestContext: Load the request object for getRequest on first call"
[lhc/web/wiklou.git]
/
includes
/
context
/
RequestContext.php
diff --git
a/includes/context/RequestContext.php
b/includes/context/RequestContext.php
index
9b6e1f3
..
36c644a
100644
(file)
--- a/
includes/context/RequestContext.php
+++ b/
includes/context/RequestContext.php
@@
-123,8
+123,13
@@
class RequestContext implements IContextSource, MutableContext {
*/
public function getRequest() {
if ( $this->request === null ) {
*/
public function getRequest() {
if ( $this->request === null ) {
- global $wgRequest; # fallback to $wg till we can improve this
- $this->request = $wgRequest;
+ global $wgCommandLineMode;
+ // create the WebRequest object on the fly
+ if ( $wgCommandLineMode ) {
+ $this->request = new FauxRequest( array() );
+ } else {
+ $this->request = new WebRequest();
+ }
}
return $this->request;
}
return $this->request;