diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-10 01:02:52 -0700 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-07-10 01:02:52 -0700 |
| commit | 6a50848a6eec361d21655819c946d8e14c073608 (patch) | |
| tree | 76594fd4aeab5e06f19c7fb87eb55336fb7cb680 | |
| parent | 7ec6f3bde9ccaa7c53bf500fff222a7b25a4a44c (diff) | |
| parent | 194ab11322cc18597fa55619f4578ec4c6adc58b (diff) | |
| download | nextcloud-server-6a50848a6eec361d21655819c946d8e14c073608.tar.gz nextcloud-server-6a50848a6eec361d21655819c946d8e14c073608.zip | |
Merge pull request #3994 from owncloud/fix_oracle_setup
General setup fixes for Oracle
| -rw-r--r-- | lib/setup/oci.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/setup/oci.php b/lib/setup/oci.php index 577948766bd..86b53de45a4 100644 --- a/lib/setup/oci.php +++ b/lib/setup/oci.php @@ -9,8 +9,8 @@ class OCI extends AbstractDatabase { public function initialize($config) { parent::initialize($config); - if (array_key_exists('dbtablespace', $options)) { - $this->dbtablespace = $options['dbtablespace']; + if (array_key_exists('dbtablespace', $config)) { + $this->dbtablespace = $config['dbtablespace']; } else { $this->dbtablespace = 'USERS'; } @@ -31,14 +31,14 @@ class OCI extends AbstractDatabase { if(!$connection) { $e = oci_error(); if (is_array ($e) && isset ($e['message'])) { - throw new DatabaseSetupException($l->t('Oracle connection could not be established'), + throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'), $e['message'].' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') .' ORACLE_SID='.getenv('ORACLE_SID') .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH') .' NLS_LANG='.getenv('NLS_LANG') .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable'); } - throw new DatabaseSetupException($l->t('Oracle username and/or password not valid'), + throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'), 'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME') .' ORACLE_SID='.getenv('ORACLE_SID') .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH') |