From 7bc8cd51c0107cd978580bddf5be37a890a49007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20Nicou=C3=A9?= <contact@paulnicoue.com>
Date: Fri, 11 Jul 2025 14:55:58 +0200
Subject: [PATCH] Removed deprecated manual merges of default site controller
 data with specific controller data

---
 site/controllers/cv.php   | 14 ++++----------
 site/controllers/home.php | 18 ++++++------------
 site/controllers/site.php |  2 +-
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/site/controllers/cv.php b/site/controllers/cv.php
index 2f53e87..c5af6c3 100644
--- a/site/controllers/cv.php
+++ b/site/controllers/cv.php
@@ -1,18 +1,12 @@
 <?php
 
-return function ($kirby, $site) {
-
-    // Get shared data from default controller (site.php)
-    $shared = $kirby->controller('site' , compact('site'));
+return function ($site) {
 
     // Get CV field content
     $cv = $site->cv();
 
-    // Return merged arrays containing shared data and current controller data
-    return A::merge(
-        $shared,
-        compact(
-            'cv',
-        )
+    // Return cv controller data
+    return compact(
+        'cv',
     );
 };
diff --git a/site/controllers/home.php b/site/controllers/home.php
index 871ac49..58b254d 100644
--- a/site/controllers/home.php
+++ b/site/controllers/home.php
@@ -1,9 +1,6 @@
 <?php
 
-return function ($kirby, $site) {
-
-    // Get shared data from default controller (site.php)
-    $shared = $kirby->controller('site' , compact('site'));
+return function ($site) {
 
     // Get CV page URL and override logo href and aria-label attributes
     $logoHref = page('cv')->url();
@@ -12,13 +9,10 @@ return function ($kirby, $site) {
     // Get items from image gallery structure field
     $galleryItems = $site->image_gallery()->toStructure();
 
-    // Return merged arrays containing shared data and current controller data
-    return A::merge(
-        $shared,
-        compact(
-            'galleryItems',
-            'logoAriaLabel',
-            'logoHref',
-        )
+    // Return home controller data
+    return compact(
+        'galleryItems',
+        'logoAriaLabel',
+        'logoHref',
     );
 };
diff --git a/site/controllers/site.php b/site/controllers/site.php
index 0b0878f..8a7594b 100644
--- a/site/controllers/site.php
+++ b/site/controllers/site.php
@@ -6,7 +6,7 @@ return function ($site) {
     $logoHref = $site->url();
     $logoAriaLabel = "Go to {$site->title()}'s home page";
 
-    // Return data
+    // Return general site controller data (merged by default with data from specific controllers)
     return compact(
         'logoAriaLabel',
         'logoHref',