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
/
api
/
ApiQuerySiteinfo.php
diff --git
a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index
30201fc
..
04892a1
100644
(file)
--- a/
includes/api/ApiQuerySiteinfo.php
+++ b/
includes/api/ApiQuerySiteinfo.php
@@
-138,6
+138,9
@@
class ApiQuerySiteinfo extends ApiQueryBase {
$data['phpversion'] = PHP_VERSION;
$data['phpsapi'] = PHP_SAPI;
$data['phpversion'] = PHP_VERSION;
$data['phpsapi'] = PHP_SAPI;
+ if ( defined( 'HHVM_VERSION' ) ) {
+ $data['hhvmversion'] = HHVM_VERSION;
+ }
$data['dbtype'] = $config->get( 'DBtype' );
$data['dbversion'] = $this->getDB()->getServerVersion();
$data['dbtype'] = $config->get( 'DBtype' );
$data['dbversion'] = $this->getDB()->getServerVersion();
@@
-166,7
+169,7
@@
class ApiQuerySiteinfo extends ApiQueryBase {
if ( $wgContLang->linkPrefixExtension() ) {
$linkPrefixCharset = $wgContLang->linkPrefixCharset();
$data['linkprefixcharset'] = $linkPrefixCharset;
if ( $wgContLang->linkPrefixExtension() ) {
$linkPrefixCharset = $wgContLang->linkPrefixCharset();
$data['linkprefixcharset'] = $linkPrefixCharset;
- // For backwards compat
a
bility
+ // For backwards compat
i
bility
$data['linkprefix'] = "/^((?>.*[^$linkPrefixCharset]|))(.+)$/sDu";
} else {
$data['linkprefixcharset'] = '';
$data['linkprefix'] = "/^((?>.*[^$linkPrefixCharset]|))(.+)$/sDu";
} else {
$data['linkprefixcharset'] = '';
@@
-393,7
+396,7
@@
class ApiQuerySiteinfo extends ApiQueryBase {
$prefix = $row['iw_prefix'];
$val = array();
$val['prefix'] = $prefix;
$prefix = $row['iw_prefix'];
$val = array();
$val['prefix'] = $prefix;
- if ( $row['iw_local'] == '1' ) {
+ if (
isset( $row['iw_local'] ) &&
$row['iw_local'] == '1' ) {
$val['local'] = '';
}
if ( $row['iw_trans'] == '1' ) {
$val['local'] = '';
}
if ( $row['iw_trans'] == '1' ) {
@@
-862,13
+865,6
@@
class ApiQuerySiteinfo extends ApiQueryBase {
return 'Return general information about the site.';
}
return 'Return general information about the site.';
}
- public function getPossibleErrors() {
- return array_merge( parent::getPossibleErrors(), array( array(
- 'code' => 'includeAllDenied',
- 'info' => 'Cannot view all servers info unless $wgShowHostnames is true'
- ), ) );
- }
-
public function getExamples() {
return array(
'api.php?action=query&meta=siteinfo&siprop=general|namespaces|namespacealiases|statistics',
public function getExamples() {
return array(
'api.php?action=query&meta=siteinfo&siprop=general|namespaces|namespacealiases|statistics',