fixes #1343 remove auto-escape of reserved keywords on MySQL 8

ie no more adding backticks around "rank" and "groups". Too many collateral damages.

include/ws_functions/pwg.categories.php

@@ -581,7 +581,7 @@ function ws_categories_setRank($params, &$service)
 {
   // does the category really exist?
   $query = '
-SELECT id, id_uppercat, rank
+SELECT id, id_uppercat, `rank`
   FROM '.CATEGORIES_TABLE.'
   WHERE id IN ('.implode(',',$params['category_id']).')
 ;';

include/ws_functions/pwg.images.php

@@ -112,9 +112,9 @@ DELETE
   if ($search_current_ranks)
   {
     $query = '
-SELECT category_id, MAX(rank) AS max_rank
+SELECT category_id, MAX(`rank`) AS max_rank
   FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE rank IS NOT NULL
+  WHERE `rank` IS NOT NULL
     AND category_id IN ('.implode(',', $new_cat_ids).')
   GROUP BY category_id
 ;';
@@ -744,7 +744,7 @@ SELECT
     image_id
   FROM '.IMAGE_CATEGORY_TABLE.'
   WHERE category_id = '.$params['category_id'].'
-  ORDER BY rank ASC
+  ORDER BY `rank` ASC
 ;';
     $image_ids = query2array($query, null, 'image_id');
 
@@ -790,7 +790,7 @@ SELECT COUNT(*)
 
   // what is the current higher rank for this category?
   $query = '
-SELECT MAX(rank) AS max_rank
+SELECT MAX(`rank`) AS max_rank
   FROM '. IMAGE_CATEGORY_TABLE .'
   WHERE category_id = '. $params['category_id'] .'
 ;';
@@ -811,17 +811,17 @@ SELECT MAX(rank) AS max_rank
   // update rank for all other photos in the same category
   $query = '
 UPDATE '. IMAGE_CATEGORY_TABLE .'
-  SET rank = rank + 1
+  SET `rank` = `rank` + 1
   WHERE category_id = '. $params['category_id'] .'
-    AND rank IS NOT NULL
-    AND rank >= '. $params['rank'] .'
+    AND `rank` IS NOT NULL
+    AND `rank` >= '. $params['rank'] .'
 ;';
   pwg_query($query);
 
   // set the new rank for the photo
   $query = '
 UPDATE '. IMAGE_CATEGORY_TABLE .'
-  SET rank = '. $params['rank'] .'
+  SET `rank` = '. $params['rank'] .'
   WHERE image_id = '. $params['image_id'] .'
     AND category_id = '. $params['category_id'] .'
 ;';