archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug 2659: Possible misconfiguration of ORDER BY + missing language string

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@15950 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2012-06-22 21:41:07 +00:00
commit 8f40368b16
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

42
admin/configuration.php
View file

@ -145,25 +145,39 @@ if (isset($_POST['submit']))
if ( !isset($conf['order_by_custom']) and !isset($conf['order_by_inside_category_custom']) )
{
if ( !empty($_POST['order_by']) )
{
// limit to the number of available parameters
$order_by = $order_by_inside_category = array_slice($_POST['order_by'], 0, ceil(count($sort_fields)/2));
// there is no rank outside categories
unset($order_by[ array_search('rank ASC', $order_by) ]);
// must define a default order_by if user want to order by rank only
if ( count($order_by) == 0 )
{
foreach ($_POST['order_by'] as $i => $val)
{
$order_by = array('id ASC');
if (empty($val)) unset($_POST['order_by'][$i]);
}
if ( !count($_POST['order_by']) )
{
array_push($page['errors'], l10n('No order field selected'));
}
else
{
// limit to the number of available parameters
$order_by = $order_by_inside_category = array_slice($_POST['order_by'], 0, ceil(count($sort_fields)/2));
// there is no rank outside categories
if ( ($i = array_search('rank ASC', $order_by)) !== false)
{
unset($order_by[$i]);
}
// must define a default order_by if user want to order by rank only
if ( count($order_by) == 0 )
{
$order_by = array('id ASC');
}
$_POST['order_by'] = 'ORDER BY '.implode(', ', $order_by);
$_POST['order_by_inside_category'] = 'ORDER BY '.implode(', ', $order_by_inside_category);
}
$_POST['order_by'] = 'ORDER BY '.implode(', ', $order_by);
$_POST['order_by_inside_category'] = 'ORDER BY '.implode(', ', $order_by_inside_category);
}
else
{
array_push($page['errors'], l10n('No field selected'));
array_push($page['errors'], l10n('No order field selected'));
}
}

1
language/en_UK/admin.lang.php
View file

@ -462,6 +462,7 @@ $lang['No photo selected, no action possible.'] = 'No photo selected, no action
$lang['No results'] = "No results";
$lang['No user to send notifications by mail.'] = "No user to be notified by mail.";
$lang['no write access'] = "no write access";
$lang['No order field selected'] = 'No order field selected';
$lang['none'] = "none";
$lang['None'] = 'None';
$lang['nothing'] = "nothing";

1
language/fr_FR/admin.lang.php
View file

@ -922,4 +922,5 @@ $lang['%d seconds'] = '%d secondes';
$lang['Sharpen'] = 'Renforcer la netteté';
$lang['Edit photo'] = 'Éditer la photo';
$lang['create a new site'] = 'créer un nouveau site';
$lang['No order field selected'] = 'Aucun critère de tri sélectionné';
?>