[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] plugins: Repair plugin parsing following !7442
"Jonny Bradley \(@jonnybradley\) via TikiWiki-cvs" <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <69a82139f3ea6_3b18a26889851@gitlab-sidekiq-low-urgency-cpu-bound-v2-6cc94ddffd-p64tt.mail> |
Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
b6706d36 by Jonny Bradley at 2026-03-04T12:00:48+00:00
[FIX] plugins: Repair plugin parsing following !7442
---
* [FIX] phpcs
* [FIX] plugins: Repair plugin parsing following !7442
See merge request tikiwiki/tiki!9683
- - - - -
1 changed file:
- lib/parser/parserlib.php
Changes:
=====================================
lib/parser/parserlib.php
=====================================
@@ -1000,9 +1000,13 @@ class ParserLib extends TikiDb_Bridge
}
$html_editor_plugin .= $argKey . '="' . implode($sep, $argValue) . '" '; // process array
$arg_str .= $argKey . '=' . implode($sep, $argValue) . '&';
- } else {
+ } else if ($argValue !== null) {
+ // now argument values can be objects so use the vaule here if there is one
+ if (isset($argValue->value)) {
+ $argValue = $argValue->value;
+ }
// even though args are now decoded we still need to escape double quotes
- $argValue = addcslashes($argValue, '"');
+ $argValue = addcslashes((string) $argValue, '"');
$html_editor_plugin .= $argKey . '="' . $argValue . '" ';
$arg_str .= $argKey . '=' . $argValue . '&';
@@ -1200,7 +1204,7 @@ class ParserLib extends TikiDb_Bridge
$filter = isset($paramInfo['filter']) ? TikiFilter::get($paramInfo['filter']) : $default;
// Preserve null values (parameters not provided by user)
- if ($argValue !== null) {
+ if ($argValue !== null && is_string($argValue)) {
$argValue = TikiLib::htmldecode($argValue);
}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b6706d365b5930d6b9936c8de4672e5d8920ab65
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/b6706d365b5930d6b9936c8de4672e5d8920ab65
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs