Tweak email signature removal.

r-a-y · Jul 4, 2013 · 4792e87 · 4792e87
1 parent a6e2770
commit 4792e87
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/includes/bp-rbe-functions.php b/includes/bp-rbe-functions.php
@@ -735,8 +735,16 @@ function bp_rbe_remove_email_client_signature( $content ) {
 				// iterate!
 				++$i;
 
-				// strip from the beginning of the sig
-				$content = substr( $content, 0, strrpos( $content, $lines[$i] ) );
+				// find position of marker
+				$marker = strrpos( $content, $lines[$i] );
+
+				// if marker matches integer 0, remove the line preceding this one
+				if ( $marker === 0 ) {
+					$marker = strrpos( $content, $lines[$i-1] );
+				}
+
+				// get body until beginning of the sig
+				$content = substr( $content, 0, $marker );
 
 			}