Skip to content

Commit 46fe3ca

Browse files
authored
Revert "Fix RSOE from filter operator errors (#9496)" (#9630)
This reverts commit 86c4770.
1 parent bf7c0b5 commit 46fe3ca

File tree

2 files changed

+16
-31
lines changed

2 files changed

+16
-31
lines changed

core/modules/filters.js

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ function parseFilterOperation(operators,filterString,p) {
8888
rexMatch = rex.exec(filterString.substring(p));
8989
if(rexMatch) {
9090
operator.regexp = new RegExp(rexMatch[1], rexMatch[2]);
91-
// DEPRECATION WARNING
92-
console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
91+
// DEPRECATION WARNING
92+
console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand",operator.regexp);
9393
nextBracketPos = p + rex.lastIndex - 1;
9494
}
9595
else {
@@ -232,12 +232,7 @@ exports.getFilterRunPrefixes = function() {
232232

233233
exports.filterTiddlers = function(filterString,widget,source) {
234234
var fn = this.compileFilter(filterString);
235-
try {
236-
const fnResult = fn.call(this,source,widget);
237-
return fnResult;
238-
} catch(e) {
239-
return [`${$tw.language.getString("Error/Filter")}: ${e}`];
240-
}
235+
return fn.call(this,source,widget);
241236
};
242237

243238
/*
@@ -319,19 +314,19 @@ exports.compileFilter = function(filterString) {
319314

320315
// Invoke the appropriate filteroperator module
321316
results = operatorFunction(accumulator,{
322-
operator: operator.operator,
323-
operand: operands.length > 0 ? operands[0] : undefined,
324-
operands: operands,
325-
multiValueOperands: multiValueOperands,
326-
isMultiValueOperand: isMultiValueOperand,
327-
prefix: operator.prefix,
328-
suffix: operator.suffix,
329-
suffixes: operator.suffixes,
330-
regexp: operator.regexp
331-
},{
332-
wiki: self,
333-
widget: widget
334-
});
317+
operator: operator.operator,
318+
operand: operands.length > 0 ? operands[0] : undefined,
319+
operands: operands,
320+
multiValueOperands: multiValueOperands,
321+
isMultiValueOperand: isMultiValueOperand,
322+
prefix: operator.prefix,
323+
suffix: operator.suffix,
324+
suffixes: operator.suffixes,
325+
regexp: operator.regexp
326+
},{
327+
wiki: self,
328+
widget: widget
329+
});
335330
if($tw.utils.isArray(results)) {
336331
accumulator = self.makeTiddlerIterator(results);
337332
} else {

editions/tw5.com/tiddlers/releasenotes/5.4.0/fix-base64-rsoe.tid

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)