From 34c9ed2eb90625894694d7c2039ccb123f21d527 Mon Sep 17 00:00:00 2001
From: halftrainedharry <katachrese@gmx.ch>
Date: Thu, 1 Sep 2022 15:48:02 +0200
Subject: [PATCH] Fix sort processors for MySQL 8

---
 .../faqman/processors/mgr/item/remove.class.php    |  6 +++---
 .../faqman/processors/mgr/item/sort.class.php      | 14 +++++++-------
 .../faqman/processors/mgr/set/sort.class.php       | 14 +++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/components/faqman/processors/mgr/item/remove.class.php b/core/components/faqman/processors/mgr/item/remove.class.php
index e47b7f3..bbfc136 100644
--- a/core/components/faqman/processors/mgr/item/remove.class.php
+++ b/core/components/faqman/processors/mgr/item/remove.class.php
@@ -57,11 +57,11 @@ public function afterRemove() {
          */
         $this->modx->exec("
             UPDATE {$this->modx->getTableName($this->classKey)}
-            SET rank = rank - 1
+            SET `rank` = `rank` - 1
             WHERE
             `set` = {$this->set}
-            AND rank > {$this->rank}
-            AND rank > 0
+            AND `rank` > {$this->rank}
+            AND `rank` > 0
         ");
         return true;
     }
diff --git a/core/components/faqman/processors/mgr/item/sort.class.php b/core/components/faqman/processors/mgr/item/sort.class.php
index 4b1d8d0..e8f612a 100644
--- a/core/components/faqman/processors/mgr/item/sort.class.php
+++ b/core/components/faqman/processors/mgr/item/sort.class.php
@@ -77,22 +77,22 @@ public function process() {
         if ($source->get('rank') < $target->get('rank')) {
             $this->modx->exec("
                 UPDATE {$this->modx->getTableName($this->classKey)}
-                  SET rank = rank - 1
+                  SET `rank` = `rank` - 1
                 WHERE
                   `set` = " . $this->getProperty('set', false) . "
-                AND rank <= {$target->get('rank')}
-                AND rank > {$source->get('rank')}
-                AND rank > 0
+                AND `rank` <= {$target->get('rank')}
+                AND `rank` > {$source->get('rank')}
+                AND `rank` > 0
             ");
             $newRank = $target->get('rank');
         } else {
             $this->modx->exec("
                 UPDATE {$this->modx->getTableName($this->classKey)}
-                  SET rank = rank + 1
+                  SET `rank` = `rank` + 1
                 WHERE
                   `set` = " . $this->getProperty('set', false) . "
-                AND rank >= {$target->get('rank')}
-                AND rank < {$source->get('rank')}
+                AND `rank` >= {$target->get('rank')}
+                AND `rank` < {$source->get('rank')}
             ");
             $newRank = $target->get('rank');
         }
diff --git a/core/components/faqman/processors/mgr/set/sort.class.php b/core/components/faqman/processors/mgr/set/sort.class.php
index 5cb0969..3640621 100644
--- a/core/components/faqman/processors/mgr/set/sort.class.php
+++ b/core/components/faqman/processors/mgr/set/sort.class.php
@@ -70,20 +70,20 @@ public function process() {
         if ($source->get('rank') < $target->get('rank')) {
             $this->modx->exec("
                 UPDATE {$this->modx->getTableName($this->classKey)}
-                SET rank = rank - 1
+                SET `rank` = `rank` - 1
                 WHERE
-                rank <= {$target->get('rank')}
-                AND rank > {$source->get('rank')}
-                AND rank > 0
+                `rank` <= {$target->get('rank')}
+                AND `rank` > {$source->get('rank')}
+                AND `rank` > 0
             ");
             $newRank = $target->get('rank');
         } else {
             $this->modx->exec("
                 UPDATE {$this->modx->getTableName($this->classKey)}
-                SET rank = rank + 1
+                SET `rank` = `rank` + 1
                 WHERE
-                rank >= {$target->get('rank')}
-                AND rank < {$source->get('rank')}
+                `rank` >= {$target->get('rank')}
+                AND `rank` < {$source->get('rank')}
             ");
             $newRank = $target->get('rank');
         }