Merge remote-tracking branch 'upstream/master'

bdaenen · Oct 24, 2019 · f9536d9 · f9536d9
2 parents b798892 + f0987c5
commit f9536d9
Show file tree

Hide file tree

Showing 3 changed files with 351 additions and 51 deletions.
diff --git a/Source/SPRuleFilterController.h b/Source/SPRuleFilterController.h
@@ -96,6 +96,8 @@ NSString * const SPRuleFilterHeightChangedNotification;
  *                 collations during search.
  * @param err      Upon return contains and object describing why the SQL conversion failed,
  *                 if it failed or nil, if no errors occured.
+ * @return         The SQL filter string. Will always be non-null unless an error occured.
+ *                 Can be an empty string (if no filters exist or all are disabled)!
  *
  * MUST BE CALLED ON THE UI THREAD!
  */