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 "Http::getProxy() method to get proxy configuration"
[lhc/web/wiklou.git]
/
includes
/
installer
/
Installer.php
diff --git
a/includes/installer/Installer.php
b/includes/installer/Installer.php
index
70fa857
..
442baf7
100644
(file)
--- a/
includes/installer/Installer.php
+++ b/
includes/installer/Installer.php
@@
-609,8
+609,7
@@
abstract class Installer {
# posix_getegid() *not* getmygid() because we want the group of the webserver,
# not whoever owns the current script.
$gid = posix_getegid();
# posix_getegid() *not* getmygid() because we want the group of the webserver,
# not whoever owns the current script.
$gid = posix_getegid();
- $getpwuid = posix_getpwuid( $gid );
- $group = $getpwuid['name'];
+ $group = posix_getpwuid( $gid )['name'];
return $group;
}
return $group;
}
@@
-843,12
+842,7
@@
abstract class Installer {
}
if ( !$caches ) {
}
if ( !$caches ) {
- $key = 'config-no-cache';
- // PHP >=5.5 is called APCu, earlier versions use APC (T61998).
- if ( !wfIsHHVM() && version_compare( PHP_VERSION, '5.5', '>=' ) ) {
- // config-no-cache-apcu
- $key .= '-apcu';
- }
+ $key = 'config-no-cache-apcu';
$this->showMessage( $key );
}
$this->showMessage( $key );
}