diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-20 20:47:51 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-20 20:49:34 +0200 |
| commit | 93edacb357ef0efa3a5beb4c12a369890a0cfd44 (patch) | |
| tree | a3b83264316c74886298d16ef6e3b7766b9072be /apps | |
| parent | d5819a5ecd26d4c7753f9c9fd0805ef83419cb0a (diff) | |
| download | nextcloud-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')
| -rw-r--r-- | apps/user_ldap/lib/access.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/helper.php | 3 |
2 files changed, 3 insertions, 2 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'; } diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index 37caedc6251..b6d7bad8727 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -159,7 +159,8 @@ class Helper { return false; } - if(strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false) { + $dbtype = \OCP\Config::getSystemValue('dbtype'); + if(strpos($dbtype, 'sqlite') !== false || $dbtype === 'oci') { $query = \OCP\DB::prepare('DELETE FROM '.$table); } else { $query = \OCP\DB::prepare('TRUNCATE '.$table); |