From e8e365db74b1c7615e40f5abbb585fe6ab833ead Mon Sep 17 00:00:00 2001 From: Charles Fulton Date: Thu, 12 Jun 2025 07:31:04 -0400 Subject: [PATCH] MDL-85772 forum: added maxbytes default for announcement forums --- mod/forum/lib.php | 1 + mod/forum/settings.php | 10 ++++++++++ mod/forum/version.php | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mod/forum/lib.php b/mod/forum/lib.php index 6deb23aead6..d70630ffb27 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -2093,6 +2093,7 @@ function forum_get_course_forum($courseid, $type) { $forum->introformat = FORMAT_HTML; $forum->forcesubscribe = $CFG->forum_announcementsubscription; $forum->maxattachments = $CFG->forum_announcementmaxattachments; + $forum->maxbytes = $CFG->forum_announcementmaxbytes; $forum->assessed = 0; if ($courseid == SITEID) { $forum->name = get_string("sitenews"); diff --git a/mod/forum/settings.php b/mod/forum/settings.php index f07883f68bd..347079e5adc 100644 --- a/mod/forum/settings.php +++ b/mod/forum/settings.php @@ -142,6 +142,16 @@ if ($ADMIN->fulltree) { $settings->add(new admin_setting_heading('defaultsettings', get_string('announcementsettings', 'mod_forum'), get_string('announcementsettings_help', 'mod_forum'))); + // Default maximum attachment size allowed per post in announcement forums. + if (isset($CFG->maxbytes)) { + $maxbytes = 0; + if (isset($CFG->forum_announcementmaxbytes)) { + $maxbytes = $CFG->forum_announcementmaxbytes; + } + $settings->add(new admin_setting_configselect('forum_announcementmaxbytes', get_string('maxattachmentsize', 'forum'), + get_string('configmaxbytes', 'forum'), 512000, get_max_upload_sizes($CFG->maxbytes, 0, 0, $maxbytes))); + } + // Default number of attachments allowed per post in announcement forums. $settings->add(new admin_setting_configtext('forum_announcementmaxattachments', get_string('maxattachments', 'forum'), get_string('configmaxattachments', 'forum'), 1, PARAM_INT)); diff --git a/mod/forum/version.php b/mod/forum/version.php index 572226a93ea..c0faeca9f18 100644 --- a/mod/forum/version.php +++ b/mod/forum/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2025041401; // The current module version (Date: YYYYMMDDXX). +$plugin->version = 2025041402; // The current module version (Date: YYYYMMDDXX). $plugin->requires = 2025040800; // Requires this Moodle version. $plugin->component = 'mod_forum'; // Full name of the plugin (used for diagnostics)