WP Merge to rev 5007

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@909 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 2 deletions

diff --git a/app.php b/app.php
index b22bbd2..08fd3d1 100644
--- a/app.php
+++ b/app.php
@@ -192,7 +192,7 @@ class AtomParser {
 				$this->in_content = array();
 			} else {
 				$endtag = $this->ns_to_prefix($name);
-				if(strstr($this->in_content[count($this->in_content)-1], "<$endtag")) {
+				if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) {
 					array_push($this->in_content, "/>");
 				} else {
 					array_push($this->in_content, "</$endtag>");
@@ -220,7 +220,7 @@ class AtomParser {
 		#print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n";
 		if(!empty($this->in_content)) {
 			// handle self-closing tags (case: text node found, need to close element started)
-			if(strstr($this->in_content[count($this->in_content)-1], "<")) {
+			if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) {
 				array_push($this->in_content, ">");
 			}
 			array_push($this->in_content, $this->xml_escape($data));