From 3879e2700336c05aa308335c58a362ad2c5509a7 Mon Sep 17 00:00:00 2001
From: Synchro <marcus@synchromedia.co.uk>
Date: Mon, 3 Mar 2014 19:58:49 +0100
Subject: [PATCH] Small simplification

---
 class.smtp.php | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/class.smtp.php b/class.smtp.php
index 44f8248b9..720a5da88 100644
--- a/class.smtp.php
+++ b/class.smtp.php
@@ -845,16 +845,14 @@ protected function get_lines()
                 break;
             }
             // Now check if reads took too long
-            if ($endtime) {
-                if (time() > $endtime) {
-                    if ($this->do_debug >= 4) {
-                        $this->edebug(
-                            'SMTP -> get_lines(): timelimit reached ('.
-                            $this->Timelimit . ' sec)'
-                        );
-                    }
-                    break;
+            if ($endtime and time() > $endtime) {
+                if ($this->do_debug >= 4) {
+                    $this->edebug(
+                        'SMTP -> get_lines(): timelimit reached ('.
+                        $this->Timelimit . ' sec)'
+                    );
                 }
+                break;
             }
         }
         return $data;