diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-11 15:19:02 +0200 |
| commit | 20ddd6e1c77224d18d5be74101b80144b7187475 (patch) | |
| tree | 1320acdc30a977f9294dc0ae2f6c36667982da31 /lib/app.php | |
| parent | 64593e4b84fdd6881a43530461c50464303cc42e (diff) | |
| parent | db6080c5c682a2bbdc420399276b81311c17802c (diff) | |
| download | nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.tar.gz nextcloud-server-20ddd6e1c77224d18d5be74101b80144b7187475.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/tests/crypt.php
Diffstat (limited to 'lib/app.php')
| -rw-r--r-- | lib/app.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/app.php b/lib/app.php index c6f6e92e60e..3e6cadfe2c9 100644 --- a/lib/app.php +++ b/lib/app.php @@ -174,7 +174,8 @@ class OC_App{ $apps=array('files'); $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`' .' WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\''; - if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack + if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison $sql = 'SELECT `appid` FROM `*PREFIX*appconfig`' .' WHERE `configkey` = \'enabled\' AND to_char(`configvalue`)=\'yes\''; } |