From e965f318558bc8bc13a2abf45e6e61260e8a2b44 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Fri, 1 May 2015 20:30:10 +1000
Subject: [PATCH 1/2] #490 <br/> now insert on the same line as a tag is
 detected as open.

---
 inc/functions.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 045cf81b..63f9a0d6 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2386,10 +2386,6 @@ function markup(&$body, $track_cites = false, $op = false) {
 						$tagsOpen = false;
 					}
 				}
-				
-				if ($tagsOpen !== false) {
-					$tagsOpen .= "<br />";
-				}
 			}
 			// If tags are closed, check to see if they are now open.
 			// This counts the number of open tags (that are not self-closing) against the number of complete tags.
@@ -2408,10 +2404,16 @@ function markup(&$body, $track_cites = false, $op = false) {
 				$tagsOpen = $paragraph;
 			}
 			
+			echo $tagsOpen;
+			echo "<hr />";
+			
 			// If tags are open, do not close it.
 			if (!$tagsOpen) {
 				$bodyNew .= "</p>";
 			}
+			else if ($tagsOpen !== false) {
+				$tagsOpen .= "<br />";
+			}
 		}
 		
 		if ($tagsOpen !== false) {

From 073dc9e54a0395ad526b79c8ab55932eb93282e2 Mon Sep 17 00:00:00 2001
From: 8n-tech <8n-tech@users.noreply.github.com>
Date: Fri, 1 May 2015 20:32:59 +1000
Subject: [PATCH 2/2] #490 Fixed test echos :--DDD

---
 inc/functions.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index 63f9a0d6..5281a231 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2404,9 +2404,6 @@ function markup(&$body, $track_cites = false, $op = false) {
 				$tagsOpen = $paragraph;
 			}
 			
-			echo $tagsOpen;
-			echo "<hr />";
-			
 			// If tags are open, do not close it.
 			if (!$tagsOpen) {
 				$bodyNew .= "</p>";