From c80254b24f8c141a26098db7a196157b2755276e Mon Sep 17 00:00:00 2001
From: "Arun S. Sekher" <arunshekher@users.noreply.github.com>
Date: Sat, 3 Jun 2017 15:19:58 +0400
Subject: [PATCH 1/2] [html] - Fix 'Element li not allowed as child of element
 div in this context.' validation error

---
 e107_plugins/poll/oldpolls.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php
index d3e3686b5..193f71966 100644
--- a/e107_plugins/poll/oldpolls.php
+++ b/e107_plugins/poll/oldpolls.php
@@ -88,13 +88,13 @@ if(e_QUERY)
 
 		if ($comment_total = $sql->gen($query))
 		{
-			$text .= "<hr /><div>";
+			$text .= "<hr /><ul class='media-list' id='comments-container'>";
 
 			while ($row2 = $sql->fetch())
 			{
 				$text .= e107::getComment()->render_comment($row2, 'poll', 'comment');
 			}
-			$text .= "</div>";
+			$text .= "</ul>";
 		}
 
 

From eca9fb87aeb87b2d9fb188f3a6cac2935ccbd186 Mon Sep 17 00:00:00 2001
From: "Arun S. Sekher" <arunshekher@users.noreply.github.com>
Date: Sat, 10 Jun 2017 22:01:41 +0400
Subject: [PATCH 2/2] Replace comments form and listing with 'compose_comment'
 method, fix comments container html validation error

---
 e107_plugins/poll/oldpolls.php | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/e107_plugins/poll/oldpolls.php b/e107_plugins/poll/oldpolls.php
index 193f71966..9a9e6d768 100644
--- a/e107_plugins/poll/oldpolls.php
+++ b/e107_plugins/poll/oldpolls.php
@@ -82,23 +82,7 @@ if(e_QUERY)
 
 		}
 */
-		$query = "SELECT c.*, u.* FROM #comments AS c
-		LEFT JOIN #user AS u ON c.comment_author_id = u.user_id
-		WHERE comment_item_id=".intval($row['poll_id'])." AND comment_type='4' ORDER BY comment_datestamp";
-
-		if ($comment_total = $sql->gen($query))
-		{
-			$text .= "<hr /><ul class='media-list' id='comments-container'>";
-
-			while ($row2 = $sql->fetch())
-			{
-				$text .= e107::getComment()->render_comment($row2, 'poll', 'comment');
-			}
-			$text .= "</ul>";
-		}
-
-
-	//	$text .= "</table>";
+		$text .= e107::getComment()->compose_comment('poll', 'comment', intval( $row['poll_id'] ), null, '', false, 'html');
 		$ns->tablerender(LAN_PLUGIN_POLL_NAME." #".$row['poll_id'], $text);
 		echo "<hr />";
 	}