FIx PHP8 warning (#9071)

roundcube · Jul 23, 2023 · 1501ca4 · 1501ca4
1 parent d2e020a
commit 1501ca4
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/program/actions/mail/mark.php b/program/actions/mail/mark.php
@@ -45,8 +45,9 @@ public function run($args = [])
         $read_deleted = (bool) $rcmail->config->get('read_when_deleted');
         $flag         = self::imap_flag($flag);
         $old_count    = 0;
+        $from         = $_POST['_from'] ?? null;
 
-        if ($flag == 'DELETED' && $skip_deleted && (!isset($_POST['_from']) || $_POST['_from'] != 'show')) {
+        if ($flag == 'DELETED' && $skip_deleted && $from != 'show') {
             // count messages before changing anything
             $old_count = $rcmail->storage->count(null, $threading ? 'THREADS' : 'ALL');
         }
@@ -79,7 +80,7 @@ public function run($args = [])
 
         if (!$marked) {
             // send error message
-            if (empty($_POST['_from']) || $_POST['_from'] != 'show') {
+            if ($from != 'show') {
                 $rcmail->output->command('list_mailbox');
             }
 
@@ -110,7 +111,7 @@ public function run($args = [])
             $rcmail->output->set_env('last_flag', $flag);
         }
         else if ($flag == 'DELETED' && $skip_deleted) {
-            if ($_POST['_from'] == 'show') {
+            if ($from == 'show') {
                 if ($next = rcube_utils::get_input_value('_next_uid', rcube_utils::INPUT_GPC)) {
                     $rcmail->output->command('show_message', $next);
                 }