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 "Indicate the actual version of HHVM in use"
[lhc/web/wiklou.git]
/
includes
/
debug
/
MWDebug.php
diff --git
a/includes/debug/MWDebug.php
b/includes/debug/MWDebug.php
index
01e0ba0
..
fb11f36
100644
(file)
--- a/
includes/debug/MWDebug.php
+++ b/
includes/debug/MWDebug.php
@@
-538,7
+538,8
@@
class MWDebug {
return array(
'mwVersion' => $wgVersion,
return array(
'mwVersion' => $wgVersion,
- 'phpVersion' => PHP_VERSION,
+ 'phpEngine' => wfIsHHVM() ? 'HHVM' : 'PHP',
+ 'phpVersion' => wfIsHHVM() ? HHVM_VERSION : PHP_VERSION,
'gitRevision' => GitInfo::headSHA1(),
'gitBranch' => GitInfo::currentBranch(),
'gitViewUrl' => GitInfo::headViewUrl(),
'gitRevision' => GitInfo::headSHA1(),
'gitBranch' => GitInfo::currentBranch(),
'gitViewUrl' => GitInfo::headViewUrl(),