mirror of
https://github.com/Piwigo/Piwigo.git
synced 2025-04-26 19:29:58 +03:00
fixes #2319 SQL does not output lines in the orders of provided ids
This commit is contained in:
parent
aaec652a66
commit
b364ecc00c
1 changed files with 11 additions and 8 deletions
|
@ -3287,22 +3287,24 @@ SELECT id
|
||||||
function add_md5sum($ids)
|
function add_md5sum($ids)
|
||||||
{
|
{
|
||||||
$query = '
|
$query = '
|
||||||
SELECT path
|
SELECT
|
||||||
|
id,
|
||||||
|
path
|
||||||
FROM '.IMAGES_TABLE.'
|
FROM '.IMAGES_TABLE.'
|
||||||
WHERE id IN ('.implode(', ',$ids).')
|
WHERE id IN ('.implode(', ',$ids).')
|
||||||
;';
|
;';
|
||||||
$paths = query2array($query, null, 'path');
|
$path_for_id = query2array($query, 'id', 'path');
|
||||||
$imgs_ids_paths = array_combine($ids, $paths);
|
|
||||||
$updates = array();
|
$updates = array();
|
||||||
foreach ($ids as $id)
|
|
||||||
|
foreach ($path_for_id as $id => $path)
|
||||||
{
|
{
|
||||||
$file = PHPWG_ROOT_PATH.$imgs_ids_paths[$id];
|
|
||||||
$md5sum = md5_file($file);
|
|
||||||
$updates[] = array(
|
$updates[] = array(
|
||||||
'id' => $id,
|
'id' => $id,
|
||||||
'md5sum' => $md5sum,
|
'md5sum' => md5_file(PHPWG_ROOT_PATH.$path),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
mass_updates(
|
mass_updates(
|
||||||
IMAGES_TABLE,
|
IMAGES_TABLE,
|
||||||
array(
|
array(
|
||||||
|
@ -3311,7 +3313,8 @@ SELECT path
|
||||||
),
|
),
|
||||||
$updates
|
$updates
|
||||||
);
|
);
|
||||||
return count($ids);
|
|
||||||
|
return count($path_for_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
function count_orphans()
|
function count_orphans()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue