diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-23 05:21:19 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-04-23 05:21:19 +0000 |
| commit | 67a19cf48b775499364cf10f99319ef585039890 (patch) | |
| tree | f5db81827363cac4210cc423f734c3e1065538be /includes/authorize.inc | |
| parent | 85430f583c74a4fc6687d12f35ea112518d3b6e7 (diff) | |
| download | brdo-67a19cf48b775499364cf10f99319ef585039890.tar.gz brdo-67a19cf48b775499364cf10f99319ef585039890.tar.bz2 | |
#688294 by Berdir, andypost, Crell, catch: Fixed Switch from db_is_active() to proper exception catching.
Diffstat (limited to 'includes/authorize.inc')
| -rw-r--r-- | includes/authorize.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/includes/authorize.inc b/includes/authorize.inc index 39a7125e6..8ae771a5d 100644 --- a/includes/authorize.inc +++ b/includes/authorize.inc @@ -159,7 +159,7 @@ function authorize_filetransfer_form_submit($form, &$form_state) { // to make sure it is available since this code could potentially (will // likely) be called during the installation process, before the // database is set up. - if (db_is_active()) { + try { $connection_settings = array(); foreach ($form_state['values']['connection_settings'][$filetransfer_backend] as $key => $value) { // We do *not* want to store passwords in the database, unless the @@ -186,6 +186,11 @@ function authorize_filetransfer_form_submit($form, &$form_state) { // Now run the operation. authorize_run_operation($filetransfer); } + catch (Exception $e) { + // If there is no database available, we don't care and just skip + // this part entirely. + } + break; case 'enter_connection_settings': |