diff options
author | blizzz <blizzz@owncloud.com> | 2014-02-20 16:22:43 +0100 |
---|---|---|
committer | blizzz <blizzz@owncloud.com> | 2014-02-20 16:22:43 +0100 |
commit | 984ea7b3ff040b7b2682d0c87f499a00b4314fb8 (patch) | |
tree | 9802e2091b428598f57897ae0a90635c4883313d /apps/user_ldap | |
parent | b946c0f08b9387115cbca7f34ec14a085a194842 (diff) | |
parent | d88c6778ff10ae6b0e5b2d40e56ec540a4e9d535 (diff) | |
download | nextcloud-server-984ea7b3ff040b7b2682d0c87f499a00b4314fb8.tar.gz nextcloud-server-984ea7b3ff040b7b2682d0c87f499a00b4314fb8.zip |
Merge pull request #7205 from owncloud/fix_7153
LDAP: prevent other configuration from being deleted when deleting the f...
Diffstat (limited to 'apps/user_ldap')
-rw-r--r-- | apps/user_ldap/lib/helper.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php index 9727d847d27..7de7fe8667f 100644 --- a/apps/user_ldap/lib/helper.php +++ b/apps/user_ldap/lib/helper.php @@ -118,10 +118,16 @@ class Helper { return false; } + $saveOtherConfigurations = ''; + if(empty($prefix)) { + $saveOtherConfigurations = 'AND `Configkey` NOT LIKE \'s%\''; + } + $query = \OCP\DB::prepare(' DELETE FROM `*PREFIX*appconfig` WHERE `configkey` LIKE ? + '.$saveOtherConfigurations.' AND `appid` = \'user_ldap\' AND `configkey` NOT IN (\'enabled\', \'installed_version\', \'types\', \'bgjUpdateGroupsLastRun\') '); |