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 DeleteUnknownPreferences hook"
[lhc/web/wiklou.git]
/
includes
/
SiteConfiguration.php
diff --git
a/includes/SiteConfiguration.php
b/includes/SiteConfiguration.php
index
7a01a65
..
2d1d961
100644
(file)
--- a/
includes/SiteConfiguration.php
+++ b/
includes/SiteConfiguration.php
@@
-556,7
+556,7
@@
class SiteConfiguration {
]
);
// ulimit5.sh breaks this call
]
);
// ulimit5.sh breaks this call
- $data = trim( wfShellExec( $cmd, $retVal, [], [ 'memory' => 0 ] ) );
+ $data = trim( wfShellExec( $cmd, $retVal, [], [ 'memory' => 0
, 'filesize' => 0
] ) );
if ( $retVal != 0 || !strlen( $data ) ) {
throw new MWException( "Failed to run getConfiguration.php." );
}
if ( $retVal != 0 || !strlen( $data ) ) {
throw new MWException( "Failed to run getConfiguration.php." );
}