summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-09-24 10:57:49 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-24 10:57:49 +0200
commit11974477bdeb699ae924fcc6e990dd899e63cf8a (patch)
treedcbdb9c700ac2eab65251e66c4415a0f309ee6f9 /lib
parentdf75c17e52001f2d59e72df132743e289c10809e (diff)
parent70572c1e3cf9e297a49091d31461d50f7611300c (diff)
downloadnextcloud-server-11974477bdeb699ae924fcc6e990dd899e63cf8a.tar.gz
nextcloud-server-11974477bdeb699ae924fcc6e990dd899e63cf8a.zip
Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null
Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
Diffstat (limited to 'lib')
-rw-r--r--lib/private/db/querybuilder/quotehelper.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/db/querybuilder/quotehelper.php b/lib/private/db/querybuilder/quotehelper.php
index 0735f313abc..4b62fee6a6c 100644
--- a/lib/private/db/querybuilder/quotehelper.php
+++ b/lib/private/db/querybuilder/quotehelper.php
@@ -52,7 +52,7 @@ class QuoteHelper {
return (string) $string;
}
- if ($string === null || $string === '*') {
+ if ($string === null || $string === 'null' || $string === '*') {
return $string;
}