diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-22 13:19:49 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-22 13:19:49 +0100 |
| commit | 02aa44d055292e291a885491bd02b9d315058afb (patch) | |
| tree | fc0278bffe74689d1d6c35c1ad3e36e29bf06420 /apps/user_ldap | |
| parent | b578a3359eecb4113044a32fce3878eb94d10e20 (diff) | |
| parent | 4474421ada2a4b5642f1a081d6491d7858b3b9b0 (diff) | |
| download | nextcloud-server-02aa44d055292e291a885491bd02b9d315058afb.tar.gz nextcloud-server-02aa44d055292e291a885491bd02b9d315058afb.zip | |
Merge branch 'master' into memcache-public
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/helper.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index 09f646921e3..9727d847d27 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -48,18 +48,25 @@ class Helper { static public function getServerConfigurationPrefixes($activeConfigurations = false) { $referenceConfigkey = 'ldap_configuration_active'; - $query = ' + $sql = ' SELECT DISTINCT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = \'user_ldap\' AND `configkey` LIKE ? '; + if($activeConfigurations) { - $query .= ' AND `configvalue` = \'1\''; + if (\OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') { + //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison + $sql .= ' AND to_char(`configvalue`)=\'1\''; + } else { + $sql .= ' AND `configvalue` = \'1\''; + } } - $query = \OCP\DB::prepare($query); - $serverConfigs = $query->execute(array('%'.$referenceConfigkey))->fetchAll(); + $stmt = \OCP\DB::prepare($sql); + + $serverConfigs = $stmt->execute(array('%'.$referenceConfigkey))->fetchAll(); $prefixes = array(); foreach($serverConfigs as $serverConfig) { |