diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-05-22 15:29:22 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-05-22 15:29:22 +0200 |
| commit | ee53bd1aa3e3cb62a93dfda66141e3537426d5dd (patch) | |
| tree | 376c87af2bb2629cb1c38098517bec8590bf6107 /lib/user.php | |
| parent | c6722581f982d05909664171bd66cc7ec2a2a67b (diff) | |
| parent | 26732ecaa63f054f76e34b276668310f344ee50b (diff) | |
| download | nextcloud-server-ee53bd1aa3e3cb62a93dfda66141e3537426d5dd.tar.gz nextcloud-server-ee53bd1aa3e3cb62a93dfda66141e3537426d5dd.zip | |
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Diffstat (limited to 'lib/user.php')
| -rw-r--r-- | lib/user.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/user.php b/lib/user.php index 2bd11022e26..26fe73f8bfe 100644 --- a/lib/user.php +++ b/lib/user.php @@ -611,6 +611,10 @@ class OC_User { public static function isEnabled($userid) { $sql = 'SELECT `userid` FROM `*PREFIX*preferences`' .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?'; + if (OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { //FIXME oracle hack + $sql = 'SELECT `userid` FROM `*PREFIX*preferences`' + .' WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND to_char(`configvalue`) = ?'; + } $stmt = OC_DB::prepare($sql); if ( ! OC_DB::isError($stmt) ) { $result = $stmt->execute(array($userid, 'core', 'enabled', 'false')); |