Merge lp:~dangarner/xibo/433593 into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

=== modified file 'server/xmds.php'
--- server/xmds.php	2009-09-27 11:25:04 +0000
+++ server/xmds.php	2009-09-29 22:13:10 +0000
@@ -784,7 +784,10 @@
 	}
 	
 	foreach ($document->documentElement->childNodes as $node)
-	{	
+	{
+		// Make sure we dont consider any text nodes
+		if ($node->nodeType == XML_TEXT_NODE) continue;
+			
 		//Zero out the common vars
 		$date 		= "";
 		$message 	= "";
@@ -797,6 +800,8 @@
 		// This will be a bunch of trace nodes
 		$message = $node->textContent;
 		
+		if ($displayInfo['isAuditing'] == 1) Debug::LogEntry ($db, "audit", 'Trace Message: [' . $message . ']', "xmds", "SubmitLog", "", $displayInfo['displayid']);
+		
 		// Each element should have a category and a date 
 		$date	= $node->getAttribute('date');
 		$cat	= $node->getAttribute('category');
@@ -900,6 +905,9 @@
 	
 	foreach ($document->documentElement->childNodes as $node)
 	{	
+		// Make sure we dont consider any text nodes
+		if ($node->nodeType == XML_TEXT_NODE) continue;
+	
 		//Zero out the common vars
 		$fromdt		= '';
 		$todt		= '';