From 58ba90f8cc7a3972486378dcd421051d5bff61d2 Mon Sep 17 00:00:00 2001
From: AdarshSantoria <adarshsantoria@gmail.com>
Date: Sat, 19 Apr 2025 00:50:42 +0530
Subject: [PATCH 1/3] fix: show correct custom fields

---
 .../com_content/src/Model/ArticleModel.php          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 46f4bca0be414..69144f02bb2c5 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -587,7 +587,18 @@ protected function loadFormData()
                         ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                     )
                 );
-                $data->set('catid', $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
+
+                // Fix: If multiple categories are filtered, pick the first one to avoid loading all fields
+                $filteredCategories = $filters['category_id'] ?? null;
+                $selectedCatId = null;
+
+                if (is_array($filteredCategories)) {
+                    $selectedCatId = (int) reset($filteredCategories);
+                } elseif (!empty($filteredCategories)) {
+                    $selectedCatId = (int) $filteredCategories;
+                }
+
+                $data->set('catid', $app->getInput()->getInt('catid', $selectedCatId));
 
                 if ($app->isClient('administrator')) {
                     $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));

From 56c2e62114ff97e61788d58109d0107c8e5bae43 Mon Sep 17 00:00:00 2001
From: AdarshSantoria <adarshsantoria@gmail.com>
Date: Sat, 19 Apr 2025 01:24:42 +0530
Subject: [PATCH 2/3] fix style

---
 .../components/com_content/src/Model/ArticleModel.php         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 69144f02bb2c5..125f98786d5f8 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -590,9 +590,9 @@ protected function loadFormData()
 
                 // Fix: If multiple categories are filtered, pick the first one to avoid loading all fields
                 $filteredCategories = $filters['category_id'] ?? null;
-                $selectedCatId = null;
+                $selectedCatId      = null;
 
-                if (is_array($filteredCategories)) {
+                if (\is_array($filteredCategories)) {
                     $selectedCatId = (int) reset($filteredCategories);
                 } elseif (!empty($filteredCategories)) {
                     $selectedCatId = (int) $filteredCategories;

From 3e816812aacd2ab51eec111f58d962f1eec108c2 Mon Sep 17 00:00:00 2001
From: Quy Ton <quy@nomonkeybiz.com>
Date: Sat, 19 Apr 2025 06:17:59 -0700
Subject: [PATCH 3/3] Update
 administrator/components/com_content/src/Model/ArticleModel.php

---
 administrator/components/com_content/src/Model/ArticleModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 125f98786d5f8..581c9d1e450ed 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -588,7 +588,7 @@ protected function loadFormData()
                     )
                 );
 
-                // Fix: If multiple categories are filtered, pick the first one to avoid loading all fields
+                // If multiple categories are filtered, pick the first one to avoid loading all fields
                 $filteredCategories = $filters['category_id'] ?? null;
                 $selectedCatId      = null;