summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2014-06-05 08:36:56 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2014-06-05 15:12:10 +0200
commit9b5271d737afb8501817db4c4f0dc25b34d8c538 (patch)
treebaa68f3089487e8c51cdbc34fffed170544cd3b5 /web
parent26a09199372262a58fa9432cbd9747333552f3ec (diff)
downloadaur-9b5271d737afb8501817db4c4f0dc25b34d8c538.tar.gz
aur-9b5271d737afb8501817db4c4f0dc25b34d8c538.tar.xz
Display versioned conflicts/provides/replaces
Show the specific conflicts/provides/replaces versions in the web interface. Implements FS#40699. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web')
-rw-r--r--web/template/pkg_details.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php
index 19daefce..c813e35a 100644
--- a/web/template/pkg_details.php
+++ b/web/template/pkg_details.php
@@ -213,9 +213,9 @@ if ($SID && ($uid == $row["MaintainerUID"] ||
<?php foreach($rels_c as $rarr): ?>
<span class="related">
<?php if ($rarr !== end($rels_c)): ?>
- <?= htmlspecialchars($rarr[0]) ?>,
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>,
<?php else: ?>
- <?= htmlspecialchars($rarr[0]) ?>
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>
<?php endif; ?>
</span>
<?php endforeach; ?>
@@ -229,9 +229,9 @@ if ($SID && ($uid == $row["MaintainerUID"] ||
<?php foreach($rels_p as $rarr): ?>
<span class="related">
<?php if ($rarr !== end($rels_p)): ?>
- <?= htmlspecialchars($rarr[0]) ?>,
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>,
<?php else: ?>
- <?= htmlspecialchars($rarr[0]) ?>
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>
<?php endif; ?>
</span>
<?php endforeach; ?>
@@ -245,9 +245,9 @@ if ($SID && ($uid == $row["MaintainerUID"] ||
<?php foreach($rels_r as $rarr): ?>
<span class="related">
<?php if ($rarr !== end($rels_r)): ?>
- <?= htmlspecialchars($rarr[0]) ?>,
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>,
<?php else: ?>
- <?= htmlspecialchars($rarr[0]) ?>
+ <?= htmlspecialchars($rarr[0] . $rarr[2]) ?>
<?php endif; ?>
</span>
<?php endforeach; ?>