#585: Avoid fetching attachments when they are already downloaded

Sebastian Krätzig · Sebastian Krätzig · commit d227aec2ab94 · 2022-01-08T17:58:13.000+01:00
diff --git a/src/PhpImap/DataPartInfo.php b/src/PhpImap/DataPartInfo.php
@@ -79,6 +79,9 @@ public function fetch(): string
         if (0 === $this->part) {
             $this->data = Imap::body($this->mail->getImapStream(), $this->id, $this->options);
         } else {
+            if (null !== $this->data) {
+                return $this->data;
+            }
             $this->data = Imap::fetchbody($this->mail->getImapStream(), $this->id, $this->part, $this->options);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ public function fetch(): string`
`79`	`79`	`if (0 === $this->part) {`
`80`	`80`	`$this->data = Imap::body($this->mail->getImapStream(), $this->id, $this->options);`
`81`	`81`	`} else {`
	`82`	`+ if (null !== $this->data) {`
	`83`	`+ return $this->data;`
	`84`	`+ }`
`82`	`85`	`$this->data = Imap::fetchbody($this->mail->getImapStream(), $this->id, $this->part, $this->options);`
`83`	`86`	`}`
`84`	`87`