From c05680ea449c14ac878b9030627711ad0e7a1bbf Mon Sep 17 00:00:00 2001
From: Bryan Nielsen <bryan@packettide.com>
Date: Wed, 21 Jan 2026 13:48:35 -0500
Subject: [PATCH] Update references to first party addon path to check for
 presence in third-party addon path first

---
 system/user/addons/forum/Model/Post.php  | 9 +++++++--
 system/user/addons/forum/Model/Topic.php | 9 +++++++--
 system/user/addons/forum/spam.forum.php  | 9 +++++++--
 system/user/addons/forum/tab.forum.php   | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/system/user/addons/forum/Model/Post.php b/system/user/addons/forum/Model/Post.php
index 48c602d..a6fcf09 100644
--- a/system/user/addons/forum/Model/Post.php
+++ b/system/user/addons/forum/Model/Post.php
@@ -131,8 +131,13 @@ public static function onBeforeBulkDelete($delete_ids)
 
     public static function onAfterBulkDelete()
     {
-        require_once PATH_ADDONS . 'forum/mod.forum.php';
-        require_once PATH_ADDONS . 'forum/mod.forum_core.php';
+        foreach(['forum/mod.forum.php', 'forum/mod.forum_core.php'] as $file) {
+            if (file_exists(PATH_THIRD . $file)) {
+                require_once PATH_THIRD . $file;
+            } else {
+                require_once PATH_ADDONS . $file;
+            }
+        }
 
         $forum_core = new \Forum_Core();
 
diff --git a/system/user/addons/forum/Model/Topic.php b/system/user/addons/forum/Model/Topic.php
index dc72498..74491d1 100644
--- a/system/user/addons/forum/Model/Topic.php
+++ b/system/user/addons/forum/Model/Topic.php
@@ -167,8 +167,13 @@ public static function onBeforeBulkDelete($delete_ids)
 
     public static function onAfterBulkDelete($delete_ids)
     {
-        require_once PATH_ADDONS . 'forum/mod.forum.php';
-        require_once PATH_ADDONS . 'forum/mod.forum_core.php';
+        foreach(['forum/mod.forum.php', 'forum/mod.forum_core.php'] as $file) {
+            if (file_exists(PATH_THIRD . $file)) {
+                require_once PATH_THIRD . $file;
+            } else {
+                require_once PATH_ADDONS . $file;
+            }
+        }
 
         $forum_core = new \Forum_Core();
 
diff --git a/system/user/addons/forum/spam.forum.php b/system/user/addons/forum/spam.forum.php
index 55ebedb..8d79bff 100644
--- a/system/user/addons/forum/spam.forum.php
+++ b/system/user/addons/forum/spam.forum.php
@@ -20,8 +20,13 @@ class Forum_spam implements SpamModerationInterface
      */
     public function __construct()
     {
-        require_once PATH_ADDONS . 'forum/mod.forum.php';
-        require_once PATH_ADDONS . 'forum/mod.forum_core.php';
+        foreach(['forum/mod.forum.php', 'forum/mod.forum_core.php'] as $file) {
+            if (file_exists(PATH_THIRD . $file)) {
+                require_once PATH_THIRD . $file;
+            } else {
+                require_once PATH_ADDONS . $file;
+            }
+        }
 
         $this->fc = new \Forum_Core();
     }
diff --git a/system/user/addons/forum/tab.forum.php b/system/user/addons/forum/tab.forum.php
index 7f60d86..8d3daff 100644
--- a/system/user/addons/forum/tab.forum.php
+++ b/system/user/addons/forum/tab.forum.php
@@ -317,8 +317,13 @@ public function save($entry, $values)
 
                 // Update the forum stats
                 if (! class_exists('Forum')) {
-                    require PATH_ADDONS . 'forum/mod.forum.php';
-                    require PATH_ADDONS . 'forum/mod.forum_core.php';
+                    foreach(['forum/mod.forum.php', 'forum/mod.forum_core.php'] as $file) {
+                        if (file_exists(PATH_THIRD . $file)) {
+                            require_once PATH_THIRD . $file;
+                        } else {
+                            require_once PATH_ADDONS . $file;
+                        }
+                    }
                 }
 
                 $forum_core = new Forum_Core();