Mercurial > hg > rc2

comparison program/lib/Roundcube/rcube_imap.php @ 19:b6a96bdd6b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More cleaning up php8 Warnings/deprecations
author Charlie Root
date Wed, 08 Oct 2025 08:50:44 -0400
parents dd5ed6ef69c9
children 73124dd49283
comparison
equal deleted inserted replaced
18:b631c1c7a3ce 19:b6a96bdd6b29
72 protected $caching = false; 72 protected $caching = false;
73 protected $messages_caching = false; 73 protected $messages_caching = false;
74 protected $threading = false; 74 protected $threading = false;
75 protected $connect_done; 75 protected $connect_done;
76 protected $sort_folder_collator; 76 protected $sort_folder_collator;
77 protected $msg_uid;
77 78
78 /** 79 /**
79 * Object constructor. 80 * Object constructor.
80 */ 81 */
81 public function __construct() 82 public function __construct()
2037 if (!is_array($part[$i])) { 2038 if (!is_array($part[$i])) {
2038 break; 2039 break;
2039 } 2040 }
2040 $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1; 2041 $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
2041 $struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id, 2042 $struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id,
2042 $mime_part_headers[$tmp_part_id]); 2043 $mime_part_headers ? $mime_part_headers[$tmp_part_id] : null);
2043 } 2044 }
2044 2045
2045 return $struct; 2046 return $struct;
2046 } 2047 }
2047 2048
3740 } 3741 }
3741 else { 3742 else {
3742 $headers = array(); 3743 $headers = array();
3743 } 3744 }
3744 3745
3745 if ($this->messages_caching || $this->options['all_headers']) { 3746 if ($this->messages_caching || !empty($this->options['all_headers'])) {
3746 $headers = array_merge($headers, $this->all_headers); 3747 $headers = array_merge($headers, $this->all_headers);
3747 } 3748 }
3748 3749
3749 return $headers; 3750 return $headers;
3750 } 3751 }