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 "resourceloader: Fix comment on Mobile Safari requirement"
[lhc/web/wiklou.git]
/
includes
/
cache
/
localisation
/
LocalisationCache.php
diff --git
a/includes/cache/localisation/LocalisationCache.php
b/includes/cache/localisation/LocalisationCache.php
index
26382aa
..
dd9e8e1
100644
(file)
--- a/
includes/cache/localisation/LocalisationCache.php
+++ b/
includes/cache/localisation/LocalisationCache.php
@@
-517,15
+517,15
@@
class LocalisationCache {
*/
protected function readPHPFile( $_fileName, $_fileType ) {
// Disable APC caching
*/
protected function readPHPFile( $_fileName, $_fileType ) {
// Disable APC caching
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
$_apcEnabled = ini_set( 'apc.cache_by_default', '0' );
$_apcEnabled = ini_set( 'apc.cache_by_default', '0' );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
include $_fileName;
include $_fileName;
-
MediaWiki
\suppressWarnings();
+
Wikimedia
\suppressWarnings();
ini_set( 'apc.cache_by_default', $_apcEnabled );
ini_set( 'apc.cache_by_default', $_apcEnabled );
-
MediaWiki
\restoreWarnings();
+
Wikimedia
\restoreWarnings();
if ( $_fileType == 'core' || $_fileType == 'extension' ) {
$data = compact( self::$allKeys );
if ( $_fileType == 'core' || $_fileType == 'extension' ) {
$data = compact( self::$allKeys );