From 6e0cb5364bd0e103bf4aaf4bb9611ca4c8dfb125 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Thu, 14 Feb 2019 11:57:29 +0100
Subject: [PATCH] ChangesList: Comment out newlines in
 EnhancedChangesListGroup.mustache

This is a follow-up to 9c5a4773952f2e914eda668b71dedb7c78a9a258.

This change removes all spaces and newlines inside of the <td> elements
by a Mustache comment. This prevents that the newline get converted to a
<p> element when the recent changes get included by

  {{Special:RecentChanges|enhanced=1}}

Bug: T215737
Change-Id: I179d0b36b122efc3e1b7c193354ad03c3c9cefcf
---
 .../EnhancedChangesListGroup.mustache         | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/includes/templates/EnhancedChangesListGroup.mustache b/includes/templates/EnhancedChangesListGroup.mustache
index 5a5986f7cf..f20afdb591 100644
--- a/includes/templates/EnhancedChangesListGroup.mustache
+++ b/includes/templates/EnhancedChangesListGroup.mustache
@@ -10,17 +10,19 @@
 				<div class="mw-rcfilters-ui-highlights-color-c5" data-color="c5"></div>
 			</div>
 		</td>
-		<td><span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space mw-collapsible-toggle-collapsed"></span></td>
+		<td>{{!
+			}}<span class="mw-collapsible-toggle mw-collapsible-arrow mw-enhancedchanges-arrow mw-enhancedchanges-arrow-space mw-collapsible-toggle-collapsed"></span>{{!
+		}}</td>
 		<td class="mw-changeslist-line-prefix">{{{ prefix }}}</td>
 		<td class="mw-enhanced-rc" colspan="2">{{{ collectedRcFlags }}}&#160;{{ timestamp }}&#160;</td>
-		<td class="mw-changeslist-line-inner">
-			{{# rev-deleted-event }}<span class="history-deleted">{{{ . }}}</span>{{/ rev-deleted-event }}
-			{{{ articleLink }}}{{{ languageDirMark }}}{{{ logText }}}
-			<span class="mw-changeslist-separator"></span>
-			{{# charDifference }}{{{ . }}} <span class="mw-changeslist-separator"></span>{{/ charDifference }}
-			<span class="changedby">{{{ users }}}</span>
-			{{ numberofWatchingusers }}
-		</td>
+		<td class="mw-changeslist-line-inner">{{!
+			}}{{# rev-deleted-event }}<span class="history-deleted">{{{ . }}}</span>{{/ rev-deleted-event }}{{!
+			}}{{{ articleLink }}}{{{ languageDirMark }}}{{{ logText }}}{{!
+			}}<span class="mw-changeslist-separator"></span>{{!
+			}}{{# charDifference }}{{{ . }}} <span class="mw-changeslist-separator"></span>{{/ charDifference }}{{!
+			}}<span class="changedby">{{{ users }}}</span>{{!
+			}}{{ numberofWatchingusers }}{{!
+		}}</td>
 	</tr>
 	{{# lines }}
 	<tr class="mw-rcfilters-ui-highlights-enhanced-nested {{# classes }}{{ . }} {{/ classes }}"{{{ attribs }}}>
@@ -38,12 +40,12 @@
 				<div class="mw-rcfilters-ui-highlights-color-c5" data-color="c5"></div>
 			</div>
 		</td>
-		<td class="mw-enhanced-rc-nested" data-target-page="{{ targetTitle }}">
-			{{# timestampLink }}
-			<span class="mw-enhanced-rc-time">{{{ . }}}</span>
-			{{/ timestampLink }}
-			{{# data }}{{{ . }}}{{/ data }}
-		</td>
+		<td class="mw-enhanced-rc-nested" data-target-page="{{ targetTitle }}">{{!
+			}}{{# timestampLink }}{{!
+			}}<span class="mw-enhanced-rc-time">{{{ . }}}</span>{{!
+			}}{{/ timestampLink }}{{!
+			}}{{# data }}{{{ . }}}{{/ data }}{{!
+		}}</td>
 	</tr>
 	{{/ lines }}
 </table>
-- 
2.20.1