tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PHP7: Fix MySQL and PostgreSQL PDO extension checks 

refs #10251
This commit is contained in:
Eric Lippmann 2016-01-28 13:52:31 +01:00
parent 4dda451c79
commit 32f87284ad
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Icinga/Application/Platform.php
View File

@ -362,7 +362,7 @@ class Platform
*/
public static function hasMysqlSupport()
{
return static::extensionLoaded('mysql') && static::classExists('Zend_Db_Adapter_Pdo_Mysql');
return static::extensionLoaded('pdo_mysql') && static::classExists('Zend_Db_Adapter_Pdo_Mysql');
}
/**
@ -398,6 +398,6 @@ class Platform
*/
public static function hasPostgresqlSupport()
{
return static::extensionLoaded('pgsql') && static::classExists('Zend_Db_Adapter_Pdo_Pgsql');
return static::extensionLoaded('pdo_pgsql') && static::classExists('Zend_Db_Adapter_Pdo_Pgsql');
}
}

4
modules/monitoring/library/Monitoring/MonitoringWizard.php
View File

@ -176,7 +176,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
$mysqlSet = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true,
'condition' => 'mysql',
'condition' => 'pdo_mysql',
'alias' => 'PDO-MySQL',
'description' => mt(
'monitoring',
@ -196,7 +196,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
$pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true,
'condition' => 'pgsql',
'condition' => 'pdo_pgsql',
'alias' => 'PDO-PostgreSQL',
'description' => mt(
'monitoring',

4
modules/setup/library/Setup/WebWizard.php
View File

@ -640,7 +640,7 @@ class WebWizard extends Wizard implements SetupWizard
$mysqlSet = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true,
'condition' => 'mysql',
'condition' => 'pdo_mysql',
'alias' => 'PDO-MySQL',
'description' => mt(
'setup',
@ -661,7 +661,7 @@ class WebWizard extends Wizard implements SetupWizard
$pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true,
'condition' => 'pgsql',
'condition' => 'pdo_pgsql',
'alias' => 'PDO-PostgreSQL',
'description' => mt(
'setup',