summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/lib/access.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-06-20 20:47:51 +0200
committerArthur Schiwon <blizzz@owncloud.com>2014-06-20 20:49:34 +0200
commit93edacb357ef0efa3a5beb4c12a369890a0cfd44 (patch)
treea3b83264316c74886298d16ef6e3b7766b9072be /apps/user_ldap/lib/access.php
parentd5819a5ecd26d4c7753f9c9fd0805ef83419cb0a (diff)
downloadnextcloud-server-93edacb357ef0efa3a5beb4c12a369890a0cfd44.tar.gz
nextcloud-server-93edacb357ef0efa3a5beb4c12a369890a0cfd44.zip
Backport subset of #4179, re-established Oracle compatibility for LDAP
Conflicts: apps/user_ldap/lib/access.php
Diffstat (limited to 'apps/user_ldap/lib/access.php')
-rw-r--r--apps/user_ldap/lib/access.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index dc7e4f1239b..d289627bead 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -607,7 +607,7 @@ class Access extends LDAPUtility implements user\IUserTools {
$sqlAdjustment = '';
$dbType = \OCP\Config::getSystemValue('dbtype');
- if($dbType === 'mysql') {
+ if($dbType === 'mysql' || $dbType == 'oci') {
$sqlAdjustment = 'FROM DUAL';
}