Disable some server checks when running on HHVM
Ref https://github.com/owncloud/core/issues/10837#issuecomment-76516839
This commit is contained in:
parent
42f6448da2
commit
4100610390
|
@ -608,6 +608,13 @@ class OC_Util {
|
|||
$invalidIniSettings = [];
|
||||
$moduleHint = $l->t('Please ask your server administrator to install the module.');
|
||||
|
||||
/**
|
||||
* FIXME: The dependency check does not work properly on HHVM on the moment
|
||||
* and prevents installation. Once HHVM is more compatible with our
|
||||
* approach to check for these values we should re-enable those
|
||||
* checks.
|
||||
*/
|
||||
if (!self::runningOnHhvm()) {
|
||||
foreach ($dependencies['classes'] as $class => $module) {
|
||||
if (!class_exists($class)) {
|
||||
$missingDependencies[] = $module;
|
||||
|
@ -623,24 +630,25 @@ class OC_Util {
|
|||
$missingDependencies[] = $module;
|
||||
}
|
||||
}
|
||||
foreach($dependencies['ini'] as $setting => $expected) {
|
||||
foreach ($dependencies['ini'] as $setting => $expected) {
|
||||
$iniWrapper = \OC::$server->getIniWrapper();
|
||||
if(is_bool($expected)) {
|
||||
if($iniWrapper->getBool($setting) !== $expected) {
|
||||
if (is_bool($expected)) {
|
||||
if ($iniWrapper->getBool($setting) !== $expected) {
|
||||
$invalidIniSettings[] = [$setting, $expected];
|
||||
}
|
||||
}
|
||||
if(is_int($expected)) {
|
||||
if($iniWrapper->getNumeric($setting) !== $expected) {
|
||||
if (is_int($expected)) {
|
||||
if ($iniWrapper->getNumeric($setting) !== $expected) {
|
||||
$invalidIniSettings[] = [$setting, $expected];
|
||||
}
|
||||
}
|
||||
if(is_string($expected)) {
|
||||
if(strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
|
||||
if (is_string($expected)) {
|
||||
if (strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
|
||||
$invalidIniSettings[] = [$setting, $expected];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
foreach($missingDependencies as $missingDependency) {
|
||||
$errors[] = array(
|
||||
|
|
Loading…
Reference in New Issue