From 8d76758cf22a62fe1f7cb4840c8962b6d3db23a1 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Sun, 10 Dec 2006 21:18:18 +0000
Subject: [PATCH] r1348: Let's generate valid XHTML in
 ListSorter->_processDataForColumn()

---
 includes/class_sort.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/includes/class_sort.php b/includes/class_sort.php
index 0093ed6..cec00f2 100644
--- a/includes/class_sort.php
+++ b/includes/class_sort.php
@@ -393,13 +393,13 @@ class ListSorter
 				$build = array();
 				foreach ($columns AS $column)
 				{
-					$build[] = '<div>' . $this->_processDataForColumn($bug, $column, $params) . '</div>';
+					$build[] = $this->_processDataForColumn($bug, $column, $params, true);
 				}
 				$data = "\n\t\t" . implode("\n\t\t", $build) . "\n\t";
 			}
 			else
 			{
-				$data = $this->_processDataForColumn($bug, $columns[0], $params);
+				$data = $this->_processDataForColumn($bug, $columns[0], $params, false);
 			}
 			$fields .= "\n\t<td>$data</td>";
 		}
@@ -415,23 +415,26 @@ class ListSorter
 	* @param	array	Bug data
 	* @param	string	Column name
 	* @param	string	Additional URL params
+	* @param	bool	Will this column have multiple data sets?
 	*
 	* @return	string	Processed column data
 	*/
-	function _processDataForColumn($bug, $column, $params = null)
+	function _processDataForColumn($bug, $column, $params = null, $multi = false)
 	{
+		$open = ($multi ? '<div>' : '');
+		$close = ($multi ? '</div>' : '');
 		switch ($column)
 		{
 			case 'summary':
-				return '<a href="showreport.php?bugid=' . $bug['bugid'] . $params . '">' . $bug['summary'] . '</a>';
+				return $open . '<a href="showreport.php?bugid=' . $bug['bugid'] . $params . '">' . $bug['summary'] . '</a>' . $close;
 			case 'userid':
-				return ($bug['userid'] ? $bug['username'] : _('Guest'));
+				return $open . ($bug['userid'] ? $bug['username'] : _('Guest')) . $close;
 			case 'lastpost':
-				return $bug['lastposttime'] . "\n\t\t<div>" . _('by') . ' ' . ($bug['lastpost'] ? $bug['lastpost'] : _('Guest'));
+				return "\n\t\t<div>" . $bug['lastposttime'] . "</div>\n\t\t<div>" . _('by') . ' ' . ($bug['lastpost'] ? $bug['lastpost'] : _('Guest')) . "</div>\n\t";
 			case 'votes':
-				return '<div>' . _('For:') . ' ' . $bug['votefor'] . "</div>\n\t\t<div>" . _('Against:') . ' ' . $bug['voteagainst'];
+				return "\n\t\t<div>" . _('For:') . ' ' . $bug['votefor'] . "</div>\n\t\t<div>" . _('Against:') . ' ' . $bug['voteagainst'] . "</div>\n\t";
 			default:
-				return $bug["$column"];
+				return $open . $bug["$column"] . $close;
 		}
 	}
 	
-- 
2.22.5