Avoid accessing maybe-unexisting header property

pabzm · pabzm · commit d727a26bc39d · 2025-09-23T17:15:57.000+02:00
diff --git a/plugins/markmirror/markmirror.php b/plugins/markmirror/markmirror.php
@@ -23,8 +23,7 @@ public function init()
 
     public function load_editor(array $args): array
     {
-        $headers = $args['message']->headers;
-        $start_markmirror = isset($headers) && $headers->get('x-edited-by-markmirror') === 'yes';
+        $start_markmirror = isset($args['message']->headers) && $args['message']->headers->get('x-edited-by-markmirror') === 'yes';
         $rcmail = rcube::get_instance();
         $rcmail->output->set_env('start_markmirror', $start_markmirror);
 

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ public function init()`
`23`	`23`
`24`	`24`	`public function load_editor(array $args): array`
`25`	`25`	`{`
`26`		`- $headers = $args['message']->headers;`
`27`		`- $start_markmirror = isset($headers) && $headers->get('x-edited-by-markmirror') === 'yes';`
	`26`	`+ $start_markmirror = isset($args['message']->headers) && $args['message']->headers->get('x-edited-by-markmirror') === 'yes';`
`28`	`27`	`$rcmail = rcube::get_instance();`
`29`	`28`	`$rcmail->output->set_env('start_markmirror', $start_markmirror);`
`30`	`29`