Mercurial > hg > rc2
diff program/lib/Roundcube/rcube_plugin_api.php @ 19:b6a96bdd6b29
More cleaning up php8 Warnings/deprecations
| author | Charlie Root |
|---|---|
| date | Wed, 08 Oct 2025 08:50:44 -0400 |
| parents | dd5ed6ef69c9 |
| children | 73124dd49283 |
line wrap: on
line diff
--- a/program/lib/Roundcube/rcube_plugin_api.php Tue Oct 07 11:20:40 2025 -0400 +++ b/program/lib/Roundcube/rcube_plugin_api.php Wed Oct 08 08:50:44 2025 -0400 @@ -212,7 +212,7 @@ if ($plugin = $this->plugins[$plugin_name]) { // init a plugin only if $force is set or if we're called after initialization - if (($force || $this->initialized) && !$this->plugins_initialized[$plugin_name] && ($force || !$this->filter($plugin))) { + if (($force || $this->initialized) && empty($this->plugins_initialized[$plugin_name]) && ($force || empty($this->filter($plugin)))) { $plugin->init(); $this->plugins_initialized[$plugin_name] = $plugin; } @@ -571,7 +571,7 @@ */ public function is_plugin_task($task) { - return $this->tasks[$task] ? true : false; + return ($this->tasks[$task]??null) ? true : false; } /** @@ -654,7 +654,7 @@ protected function template_container_hook($attrib) { $container = $attrib['name']; - return array('content' => $attrib['content'] . $this->template_contents[$container]); + return array('content' => ($attrib['content']??'') . $this->template_contents[$container]); } /**
