Update installer to use new Schema code to create the core tables instead of db/statu...

[quix0rs-gnu-social.git] / lib / mailhandler.php

diff --git a/lib/mailhandler.php b/lib/mailhandler.php
index 85be89f1868540b10e41f232ed9d4cdff82f26e6..e9ba418399dcad6709fbb2530c6360e609f03ffc 100644 (file)
--- a/lib/mailhandler.php
+++ b/lib/mailhandler.php
@@ -160,7 +160,7 @@ class MailHandler
         foreach($mediafiles as $mf){
             $mf->attachToNotice($notice);
         }
-        common_broadcast_notice($notice);
+
         $this->log(LOG_INFO,
                    'Added notice ' . $notice->id . ' from user ' . $user->nickname);
         return true;
@@ -265,6 +265,10 @@ class MailHandler
             if (preg_match('/^\s*Begin\s+forward/', $line)) {
                 break;
             }
+            // skip everything after a blank line if we already have content
+            if ($output !== '' && $line === '') {
+                break;
+            }
 
             $output .= ' ' . $line;
         }