Skip to content

Commit 54807c3

Browse files
committed
Fix condition logic for user signature and null checks
1 parent 1c0067e commit 54807c3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

wcfsetup/install/files/lib/system/condition/type/user/AbstractUserIsNullConditionType.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ abstract class AbstractUserIsNullConditionType extends AbstractUserBooleanCondit
1616
public function applyFilter(DatabaseObjectList $objectList): void
1717
{
1818
if ($this->filter) {
19-
$objectList->getConditionBuilder()->add("{$objectList->getDatabaseTableAlias()}.{$this->columnName} IS NULL");
20-
} else {
2119
$objectList->getConditionBuilder()->add("{$objectList->getDatabaseTableAlias()}.{$this->columnName} IS NOT NULL");
20+
} else {
21+
$objectList->getConditionBuilder()->add("{$objectList->getDatabaseTableAlias()}.{$this->columnName} IS NULL");
2222
}
2323
}
2424

wcfsetup/install/files/lib/system/condition/type/user/UserSignatureConditionType.class.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ public function applyFilter(DatabaseObjectList $objectList): void
2222
{
2323
if ($this->filter) {
2424
$objectList->getConditionBuilder()->add(
25-
"({$objectList->getDatabaseTableAlias()}.signature = ? OR {$objectList->getDatabaseTableAlias()}.signature IS NULL)",
25+
"({$objectList->getDatabaseTableAlias()}.signature <> ? AND {$objectList->getDatabaseTableAlias()}.signature IS NOT NULL)",
2626
['']
2727
);
2828
} else {
2929
$objectList->getConditionBuilder()->add(
30-
"({$objectList->getDatabaseTableAlias()}.signature <> ? AND {$objectList->getDatabaseTableAlias()}.signature IS NOT NULL)",
30+
"({$objectList->getDatabaseTableAlias()}.signature = ? OR {$objectList->getDatabaseTableAlias()}.signature IS NULL)",
3131
['']
3232
);
3333
}

0 commit comments

Comments
 (0)