tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

PHP7: Fix MySQL and PostgreSQL PDO extension checks

Browse Source 
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() 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() 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 = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array( $mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'mysql', 'condition' => 'pdo_mysql',
'alias' => 'PDO-MySQL', 'alias' => 'PDO-MySQL',
'description' => mt( 'description' => mt(
'monitoring', 'monitoring',
@ -196,7 +196,7 @@ class MonitoringWizard extends Wizard implements SetupWizard
$pgsqlSet = new RequirementSet(true); $pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array( $pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'pgsql', 'condition' => 'pdo_pgsql',
'alias' => 'PDO-PostgreSQL', 'alias' => 'PDO-PostgreSQL',
'description' => mt( 'description' => mt(
'monitoring', '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 = new RequirementSet(true);
$mysqlSet->add(new PhpModuleRequirement(array( $mysqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'mysql', 'condition' => 'pdo_mysql',
'alias' => 'PDO-MySQL', 'alias' => 'PDO-MySQL',
'description' => mt( 'description' => mt(
'setup', 'setup',
@ -661,7 +661,7 @@ class WebWizard extends Wizard implements SetupWizard
$pgsqlSet = new RequirementSet(true); $pgsqlSet = new RequirementSet(true);
$pgsqlSet->add(new PhpModuleRequirement(array( $pgsqlSet->add(new PhpModuleRequirement(array(
'optional' => true, 'optional' => true,
'condition' => 'pgsql', 'condition' => 'pdo_pgsql',
'alias' => 'PDO-PostgreSQL', 'alias' => 'PDO-PostgreSQL',
'description' => mt( 'description' => mt(
'setup', 'setup',