mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-28 04:09:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quote 'rank' field name in SQL

Browse source 
Add backticks to reserved word 'rank' in SQL queries.

Bug: GH #919
This commit is contained in:
Sam Wilson 2018-08-30 13:33:05 +08:00 • committed by Pierrick Le Gall
parent af85a62199
commit 8e9cb6de23
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/cat_list.php
View file

@ -295,7 +295,7 @@ $template->assign(array(
$categories = array(); $categories = array();
$query = ' $query = '
SELECT id, name, permalink, dir, rank, status SELECT id, name, permalink, dir, `rank`, status
FROM '.CATEGORIES_TABLE; FROM '.CATEGORIES_TABLE;
if (!isset($_GET['parent_id'])) if (!isset($_GET['parent_id']))
{ {
@ -308,7 +308,7 @@ else
WHERE id_uppercat = '.$_GET['parent_id']; WHERE id_uppercat = '.$_GET['parent_id'];
} }
$query.= ' $query.= '
ORDER BY rank ASC ORDER BY `rank` ASC
;'; ;';
$categories = hash_from_query($query, 'id'); $categories = hash_from_query($query, 'id');

4
admin/element_set_ranks.php
View file

@ -143,11 +143,11 @@ SELECT
representative_ext, representative_ext,
width, height, rotation, width, height, rotation,
name, name,
rank `rank`
FROM '.IMAGES_TABLE.' FROM '.IMAGES_TABLE.'
JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id JOIN '.IMAGE_CATEGORY_TABLE.' ON image_id = id
WHERE category_id = '.$page['category_id'].' WHERE category_id = '.$page['category_id'].'
ORDER BY rank ORDER BY `rank`
;'; ;';
$result = pwg_query($query); $result = pwg_query($query);
if (pwg_db_num_rows($result) > 0) if (pwg_db_num_rows($result) > 0)

10
admin/include/functions.php
View file

@ -674,9 +674,9 @@ function save_categories_order($categories)
function update_global_rank() function update_global_rank()
{ {
$query = ' $query = '
SELECT id, id_uppercat, uppercats, rank, global_rank SELECT id, id_uppercat, uppercats, `rank`, global_rank
FROM '.CATEGORIES_TABLE.' FROM '.CATEGORIES_TABLE.'
ORDER BY id_uppercat,rank,name'; ORDER BY id_uppercat, `rank`, name';
global $cat_map; // used in preg_replace callback global $cat_map; // used in preg_replace callback
$cat_map = array(); $cat_map = array();
@ -1442,7 +1442,7 @@ function create_virtual_category($category_name, $parent_id=null, $options=array
{ {
//what is the current higher rank for this parent? //what is the current higher rank for this parent?
$query = ' $query = '
SELECT MAX(rank) AS max_rank SELECT MAX(`rank`) AS max_rank
FROM '. CATEGORIES_TABLE .' FROM '. CATEGORIES_TABLE .'
WHERE id_uppercat '.(empty($parent_id) ? 'IS NULL' : '= '.$parent_id).' WHERE id_uppercat '.(empty($parent_id) ? 'IS NULL' : '= '.$parent_id).'
;'; ;';
@ -1919,9 +1919,9 @@ SELECT
$query = ' $query = '
SELECT SELECT
category_id, category_id,
MAX(rank) AS max_rank MAX(`rank`) AS max_rank
FROM '.IMAGE_CATEGORY_TABLE.' FROM '.IMAGE_CATEGORY_TABLE.'
WHERE rank IS NOT NULL WHERE `rank` IS NOT NULL
AND category_id IN ('.implode(',', $categories).') AND category_id IN ('.implode(',', $categories).')
GROUP BY category_id GROUP BY category_id
;'; ;';

2
admin/site_update.php
View file

@ -178,7 +178,7 @@ SELECT id
// let's see if some categories already have some sub-categories... // let's see if some categories already have some sub-categories...
$query = ' $query = '
SELECT id_uppercat, MAX(rank)+1 AS next_rank SELECT id_uppercat, MAX(`rank`)+1 AS next_rank
FROM '.CATEGORIES_TABLE.' FROM '.CATEGORIES_TABLE.'
GROUP BY id_uppercat'; GROUP BY id_uppercat';
$result = pwg_query($query); $result = pwg_query($query);