From 2274fff424475a4e503480d6d357eed34c79ef6d Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Tue, 12 Dec 2023 09:51:38 +0100
Subject: [PATCH] fix: [component:CRUD] Make sure not to override table aliases
 when paginating

---
 src/Controller/Component/CRUDComponent.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Controller/Component/CRUDComponent.php b/src/Controller/Component/CRUDComponent.php
index 2a74da4..f8a227d 100644
--- a/src/Controller/Component/CRUDComponent.php
+++ b/src/Controller/Component/CRUDComponent.php
@@ -90,7 +90,9 @@ class CRUDComponent extends Component
             if ($this->_validOrderFields($sort) && ($direction === 'asc' || $direction === 'desc')) {
                 $sort = explode('.', $sort);
                 if (count($sort) > 1) {
-                    $sort[0] = Inflector::camelize(Inflector::pluralize($sort[0]));
+                    if ($sort[0] != $this->Table->getAlias()) {
+                        $sort[0] = Inflector::camelize(Inflector::pluralize($sort[0]));
+                    }
                 }
                 $sort = implode('.', $sort);
                 $query->order($sort . ' ' . $direction);