From d3d9df44cdcb35c40382f63c96ff16e5579ae072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Wittmann=20=E2=80=93=20Gestaltung=20=26=20Entwicklu?= =?UTF-8?q?ng?= Date: Fri, 11 Jul 2025 11:39:49 +0200 Subject: [PATCH 1/5] bugfix trim() fatale error in modOutputFilter.php --- core/src/Revolution/Filters/modOutputFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/Revolution/Filters/modOutputFilter.php b/core/src/Revolution/Filters/modOutputFilter.php index 146af8dafbe..6e423149805 100644 --- a/core/src/Revolution/Filters/modOutputFilter.php +++ b/core/src/Revolution/Filters/modOutputFilter.php @@ -63,7 +63,7 @@ public function filter(&$element) $this->log('Processing Modifier: ' . $m_cmd . ' (parameters: ' . $m_val . ')'); - $output = trim($output); + $output = trim((string) $output); try { switch ($m_cmd) { From 56150989c22d7a88a4c997ea1b2a700da4701f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Wittmann=20=E2=80=93=20Gestaltung=20=26=20Entwicklu?= =?UTF-8?q?ng?= Date: Fri, 19 Sep 2025 10:55:29 +0200 Subject: [PATCH 2/5] Apply suggestion from @smg6511 Co-authored-by: Jim Graham --- core/src/Revolution/Filters/modOutputFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/Revolution/Filters/modOutputFilter.php b/core/src/Revolution/Filters/modOutputFilter.php index 6e423149805..772a9f27a8f 100644 --- a/core/src/Revolution/Filters/modOutputFilter.php +++ b/core/src/Revolution/Filters/modOutputFilter.php @@ -63,7 +63,7 @@ public function filter(&$element) $this->log('Processing Modifier: ' . $m_cmd . ' (parameters: ' . $m_val . ')'); - $output = trim((string) $output); + $output = is_string($output) ? trim($output) : $output; try { switch ($m_cmd) { From 711961f8104bebc7fd2322ee0d1e88cc918dbe1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Wittmann=20=E2=80=93=20Gestaltung=20=26=20Entwicklu?= =?UTF-8?q?ng?= Date: Fri, 19 Sep 2025 10:56:24 +0200 Subject: [PATCH 3/5] filter non scalar values in modOutputFilter --- core/src/Revolution/Filters/modOutputFilter.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/Revolution/Filters/modOutputFilter.php b/core/src/Revolution/Filters/modOutputFilter.php index 772a9f27a8f..e789fcc71cf 100644 --- a/core/src/Revolution/Filters/modOutputFilter.php +++ b/core/src/Revolution/Filters/modOutputFilter.php @@ -45,6 +45,10 @@ function __construct(modX &$modx) */ public function filter(&$element) { + if (!is_scalar($element->_output)) { + return; + } + $usemb = function_exists('mb_strlen') && (boolean)$this->modx->getOption('use_multibyte', null, false); $encoding = $this->modx->getOption('modx_charset', null, 'UTF-8'); From 5c655fc789dc48196ca13bd1e82831f46a0c1600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20Wittmann=20=E2=80=93=20Gestaltung=20=26=20Entwicklu?= =?UTF-8?q?ng?= Date: Fri, 19 Sep 2025 11:00:12 +0200 Subject: [PATCH 4/5] remove whitespace from modOutputFilter --- core/src/Revolution/Filters/modOutputFilter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/Revolution/Filters/modOutputFilter.php b/core/src/Revolution/Filters/modOutputFilter.php index e789fcc71cf..638dd25df38 100644 --- a/core/src/Revolution/Filters/modOutputFilter.php +++ b/core/src/Revolution/Filters/modOutputFilter.php @@ -48,7 +48,7 @@ public function filter(&$element) if (!is_scalar($element->_output)) { return; } - + $usemb = function_exists('mb_strlen') && (boolean)$this->modx->getOption('use_multibyte', null, false); $encoding = $this->modx->getOption('modx_charset', null, 'UTF-8'); From cce541b4c7b3d9a776a2a3b6411a837b3e1dc5d5 Mon Sep 17 00:00:00 2001 From: Jason Coward Date: Tue, 4 Nov 2025 12:18:35 -0700 Subject: [PATCH 5/5] Separate header block with single blank line --- core/src/Revolution/Filters/modOutputFilter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/Revolution/Filters/modOutputFilter.php b/core/src/Revolution/Filters/modOutputFilter.php index 638dd25df38..2052e3a0ec6 100644 --- a/core/src/Revolution/Filters/modOutputFilter.php +++ b/core/src/Revolution/Filters/modOutputFilter.php @@ -1,4 +1,5 @@