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 "mediawiki.language: fix convertNumber( ..., true )"
[lhc/web/wiklou.git]
/
includes
/
MediaWikiServices.php
diff --git
a/includes/MediaWikiServices.php
b/includes/MediaWikiServices.php
index
ba8b71b
..
7c9363c
100644
(file)
--- a/
includes/MediaWikiServices.php
+++ b/
includes/MediaWikiServices.php
@@
-22,6
+22,7
@@
use MediaWiki\Services\NoSuchServiceException;
use MWException;
use MimeAnalyzer;
use ObjectCache;
use MWException;
use MimeAnalyzer;
use ObjectCache;
+use Parser;
use ProxyLookup;
use SearchEngine;
use SearchEngineConfig;
use ProxyLookup;
use SearchEngine;
use SearchEngineConfig;
@@
-191,7
+192,6
@@
class MediaWikiServices extends ServiceContainer {
} else {
$oldInstance->destroy();
}
} else {
$oldInstance->destroy();
}
-
}
/**
}
/**
@@
-297,7
+297,7
@@
class MediaWikiServices extends ServiceContainer {
self::resetGlobalInstance();
// Child, reseed because there is no bug in PHP:
self::resetGlobalInstance();
// Child, reseed because there is no bug in PHP:
- // http://bugs.php.net/bug.php?id=42465
+ // http
s
://bugs.php.net/bug.php?id=42465
mt_srand( getmypid() );
}
mt_srand( getmypid() );
}
@@
-565,6
+565,14
@@
class MediaWikiServices extends ServiceContainer {
return $this->getService( 'ProxyLookup' );
}
return $this->getService( 'ProxyLookup' );
}
+ /**
+ * @since 1.29
+ * @return Parser
+ */
+ public function getParser() {
+ return $this->getService( 'Parser' );
+ }
+
/**
* @since 1.28
* @return GenderCache
/**
* @since 1.28
* @return GenderCache