feature 2548 multisize - custom sizes restricted to those requested by theme/plugin

code refacto

git-svn-id: http://piwigo.org/svn/trunk@13021 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-02-02 20:59:41 +00:00
parent a68826cbb3
commit 18036a70fc
9 changed files with 142 additions and 112 deletions
+4 -18
View File
@@ -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'),