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 "RightsLogFormatter: Use DB key to generate foreign user link"
[lhc/web/wiklou.git]
/
includes
/
context
/
DerivativeContext.php
diff --git
a/includes/context/DerivativeContext.php
b/includes/context/DerivativeContext.php
index
00323ca
..
1b881e4
100644
(file)
--- a/
includes/context/DerivativeContext.php
+++ b/
includes/context/DerivativeContext.php
@@
-26,7
+26,7
@@
* a different Title instance set on it.
* @since 1.19
*/
* a different Title instance set on it.
* @since 1.19
*/
-class DerivativeContext extends ContextSource {
+class DerivativeContext extends ContextSource
implements MutableContext
{
/**
* @var WebRequest
*/
/**
* @var WebRequest
*/
@@
-67,6
+67,16
@@
class DerivativeContext extends ContextSource {
*/
private $config;
*/
private $config;
+ /**
+ * @var Stats
+ */
+ private $stats;
+
+ /**
+ * @var Timing
+ */
+ private $timing;
+
/**
* Constructor
* @param IContextSource $context Context to inherit from
/**
* Constructor
* @param IContextSource $context Context to inherit from
@@
-110,6
+120,19
@@
class DerivativeContext extends ContextSource {
}
}
}
}
+ /**
+ * Get the timing object
+ *
+ * @return Timing
+ */
+ public function getTiming() {
+ if ( !is_null( $this->timing ) ) {
+ return $this->timing;
+ } else {
+ return $this->getContext()->getTiming();
+ }
+ }
+
/**
* Set the WebRequest object
*
/**
* Set the WebRequest object
*