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 "Add expensive parser functions {{REVISION*:}}"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQuerySiteinfo.php
diff --git
a/includes/api/ApiQuerySiteinfo.php
b/includes/api/ApiQuerySiteinfo.php
index
3c22a73
..
ac9e85a
100644
(file)
--- a/
includes/api/ApiQuerySiteinfo.php
+++ b/
includes/api/ApiQuerySiteinfo.php
@@
-123,6
+123,7
@@
class ApiQuerySiteinfo extends ApiQueryBase {
$data['mainpage'] = $mainPage->getPrefixedText();
$data['base'] = wfExpandUrl( $mainPage->getFullURL(), PROTO_CURRENT );
$data['sitename'] = $GLOBALS['wgSitename'];
$data['mainpage'] = $mainPage->getPrefixedText();
$data['base'] = wfExpandUrl( $mainPage->getFullURL(), PROTO_CURRENT );
$data['sitename'] = $GLOBALS['wgSitename'];
+ $data['logo'] = $GLOBALS['wgLogo'];
$data['generator'] = "MediaWiki {$GLOBALS['wgVersion']}";
$data['phpversion'] = phpversion();
$data['phpsapi'] = PHP_SAPI;
$data['generator'] = "MediaWiki {$GLOBALS['wgVersion']}";
$data['phpversion'] = phpversion();
$data['phpsapi'] = PHP_SAPI;
@@
-152,8
+153,12
@@
class ApiQuerySiteinfo extends ApiQueryBase {
}
if ( $wgContLang->linkPrefixExtension() ) {
}
if ( $wgContLang->linkPrefixExtension() ) {
- $data['linkprefix'] = wfMessage( 'linkprefix' )->inContentLanguage()->text();
+ $linkPrefixCharset = $wgContLang->linkPrefixCharset();
+ $data['linkprefixcharset'] = $linkPrefixCharset;
+ // For backwards compatability
+ $data['linkprefix'] = "/^((?>.*[^$linkPrefixCharset]|))(.+)$/sDu";
} else {
} else {
+ $data['linkprefixcharset'] = '';
$data['linkprefix'] = '';
}
$data['linkprefix'] = '';
}
@@
-420,6
+425,9
@@
class ApiQuerySiteinfo extends ApiQueryBase {
$data['activeusers'] = intval( SiteStats::activeUsers() );
$data['admins'] = intval( SiteStats::numberingroup( 'sysop' ) );
$data['jobs'] = intval( SiteStats::jobs() );
$data['activeusers'] = intval( SiteStats::activeUsers() );
$data['admins'] = intval( SiteStats::numberingroup( 'sysop' ) );
$data['jobs'] = intval( SiteStats::jobs() );
+
+ wfRunHooks( 'APIQuerySiteInfoStatisticsInfo', array( &$data ) );
+
return $this->getResult()->addValue( 'query', $property, $data );
}
return $this->getResult()->addValue( 'query', $property, $data );
}
@@
-473,7
+481,7
@@
class ApiQuerySiteinfo extends ApiQueryBase {
global $wgFileExtensions;
$data = array();
global $wgFileExtensions;
$data = array();
- foreach (
$wgFileExtensions
as $ext ) {
+ foreach (
array_unique( $wgFileExtensions )
as $ext ) {
$data[] = array( 'ext' => $ext );
}
$this->getResult()->setIndexedTagName( $data, 'fe' );
$data[] = array( 'ext' => $ext );
}
$this->getResult()->setIndexedTagName( $data, 'fe' );