aboutsummaryrefslogtreecommitdiffstats
path: root/include/picture_comment.inc.php
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--include/picture_comment.inc.php22
1 files changed, 4 insertions, 18 deletions
diff --git a/include/picture_comment.inc.php b/include/picture_comment.inc.php
index da674482f..7432aa8d5 100644
--- a/include/picture_comment.inc.php
+++ b/include/picture_comment.inc.php
@@ -126,26 +126,12 @@ SELECT
if ($row['nb_comments'] > 0)
{
// comments order (get, session, conf)
- if (!empty($_GET['comments_order']))
+ if (!empty($_GET['comments_order']) && in_array(strtoupper($_GET['comments_order']), array('ASC', 'DESC')))
{
- if (in_array(strtoupper($_GET['comments_order']), array('ASC', 'DESC')))
- {
- $comments_order = $_GET['comments_order'];
- pwg_set_session_var('comments_order', $comments_order);
- }
- else
- {
- $comments_order = $conf['comments_order'];
- }
- }
- else if (pwg_get_session_var('comments_order') !== null)
- {
- $comments_order = pwg_get_session_var('comments_order');
- }
- else
- {
- $comments_order = $conf['comments_order'];
+ pwg_set_session_var('comments_order', $_GET['comments_order']);
}
+ $comments_order = pwg_get_session_var('comments_order', $conf['comments_order']);
+
$template->assign(array(
'COMMENTS_ORDER_URL' => duplicate_picture_url().'&comments_order='.($comments_order == 'ASC' ? 'DESC' : 'ASC'),
'COMMENTS_ORDER_TITLE' => $comments_order == 'ASC' ? l10n('ascending') : l10n('descending'),