git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
issue/activity: only concatenate messages after images
[minimedit.git]
/
widget
/
issue
/
activity.php
diff --git
a/widget/issue/activity.php
b/widget/issue/activity.php
index 23b95c6b9890d050c5bd282711d724df289e5ff5..371f11a665216d744b6526918b1363fadd2d05a1 100644
(file)
--- a/
widget/issue/activity.php
+++ b/
widget/issue/activity.php
@@
-11,7
+11,7
@@
$query = $Db->query($sql);
$msgformat = [
"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
$msgformat = [
"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
- '{(.*)(<p><img [^>]+></p>)\s*}' => "$2\n$1",
+ '{(.*)(<p><img [^>]+></p>)\s*}
s
' => "$2\n$1",
'{(?<=<img src=")(?=/)}' => '/thumb/300x',
];
'{(?<=<img src=")(?=/)}' => '/thumb/300x',
];
@@
-19,7
+19,8
@@
print '<dl class="replies">';
$prev = NULL;
while ($row = $query->fetch()) {
$prev = NULL;
while ($row = $query->fetch()) {
- if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author) {
+ if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+ or !preg_match('/\A<p><img/', $prev->message)) {
print '<dt>';
if (!$prev or $prev->issue !== $row->issue) {
printf('<a href="/%s">%s</a>', $row->page, $row->subject);
print '<dt>';
if (!$prev or $prev->issue !== $row->issue) {
printf('<a href="/%s">%s</a>', $row->page, $row->subject);