Skip to content

Update references to first party addon path to check for presence in third-party addon path first #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bryannielsen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update references to first party addon path to check for presence in third-party addon path first #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions system/user/addons/forum/Model/Post.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
9 changes: 7 additions & 2 deletions system/user/addons/forum/Model/Topic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
9 changes: 7 additions & 2 deletions system/user/addons/forum/spam.forum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
9 changes: 7 additions & 2 deletions system/user/addons/forum/tab.forum.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down