summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Weiman <mark.weiman@markzz.com>2016-02-16 08:21:55 -0500
committerLukas Fleischer <lfleischer@archlinux.org>2016-02-19 18:18:48 +0100
commitc23914fc1df309a6b1d85ec5387cfbef2161e655 (patch)
tree0976846874475c148d3ba178b6dcefd720e607c5
parentfb56ec9d1e4c814f76e6c84174151376092b96dc (diff)
downloadaurweb-c23914fc1df309a6b1d85ec5387cfbef2161e655.tar.xz
Unset $pinned unconditionally when displaying comments
In pkg_comments.php, the $pinned variable is used to determine whether the template is supposed to print all comments or pinned comments only. If the $pinned variable is unset, the top 10 comments are printed, followed by an "All comments" link. If the $pinned variable is set, the pinned comments are printed and the "All comments" link below the comment listing is skipped. Thus, we need to make sure that this variable is always unset at the time we include the template to display all comments, even if it was empty before. Fixes FS#48194. Signed-off-by: Mark Weiman <mark.weiman@markzz.com> Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--web/lib/pkgbasefuncs.inc.php2
-rw-r--r--web/lib/pkgfuncs.inc.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php
index c0e672a..1691bff 100644
--- a/web/lib/pkgbasefuncs.inc.php
+++ b/web/lib/pkgbasefuncs.inc.php
@@ -252,8 +252,8 @@ function pkgbase_display_details($base_id, $row, $SID="") {
$pinned = pkgbase_comments($base_id, $limit_pinned, false, true);
if (!empty($pinned)) {
include('pkg_comments.php');
- unset($pinned);
}
+ unset($pinned);
$limit = isset($_GET['comments']) ? 0 : 10;
$comments = pkgbase_comments($base_id, $limit, $include_deleted);
diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php
index 0e152dd..eaea318 100644
--- a/web/lib/pkgfuncs.inc.php
+++ b/web/lib/pkgfuncs.inc.php
@@ -629,8 +629,8 @@ function pkg_display_details($id=0, $row, $SID="") {
$pinned = pkgbase_comments($base_id, $limit_pinned, false, true);
if (!empty($pinned)) {
include('pkg_comments.php');
- unset($pinned);
}
+ unset($pinned);
$limit = isset($_GET['comments']) ? 0 : 10;
$comments = pkgbase_comments($base_id, $limit, $include_deleted);