diff --git a/application/forms/Config/Resource/DbResourceForm.php b/application/forms/Config/Resource/DbResourceForm.php index c270f7d91..edf82e487 100644 --- a/application/forms/Config/Resource/DbResourceForm.php +++ b/application/forms/Config/Resource/DbResourceForm.php @@ -146,17 +146,6 @@ class DbResourceForm extends Form 'label' => $this->translate('Character Set') ) ); - $this->addElement( - 'checkbox', - 'persistent', - array( - 'description' => $this->translate( - 'Check this box for persistent database connections. Persistent connections are not closed at the' - . ' end of a request, but are cached and re-used. This is experimental' - ), - 'label' => $this->translate('Persistent') - ) - ); $this->addElement( 'checkbox', 'use_ssl', diff --git a/library/Icinga/Data/Db/DbConnection.php b/library/Icinga/Data/Db/DbConnection.php index f38f6eb75..ffce026e2 100644 --- a/library/Icinga/Data/Db/DbConnection.php +++ b/library/Icinga/Data/Db/DbConnection.php @@ -141,7 +141,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp 'password' => $this->config->password, 'dbname' => $this->config->dbname, 'charset' => $this->config->charset ?: null, - 'persistent' => (bool) $this->config->get('persistent', false), 'options' => & $genericAdapterOptions, 'driver_options' => & $driverOptions ); @@ -159,7 +158,6 @@ class DbConnection implements Selectable, Extensible, Updatable, Reducible, Insp } if ($pdoType === 'dblib') { // Driver does not support setting attributes - unset($adapterParamaters['persistent']); unset($adapterParamaters['options']); unset($adapterParamaters['driver_options']); }