Revert "Add disable_forum_notifications configuration setting - refs BT#16898"

This reverts commit 80a7fa49af.
pull/3138/head
Angel Fernando Quiroz Campos 6 years ago
parent 80a7fa49af
commit b525f26583
  1. 5
      main/forum/forumfunction.inc.php
  2. 6
      main/forum/index.php
  3. 5
      main/forum/viewforum.php
  4. 3
      main/install/configuration.dist.php

@ -5776,11 +5776,6 @@ function get_notifications($content, $id)
function send_notifications($forum_id = 0, $thread_id = 0, $post_id = 0)
{
$forum_id = (int) $forum_id;
if (api_get_configuration_value('disable_forum_notifications')) {
return false;
}
// Users who subscribed to the forum
if ($forum_id != 0) {
$users_to_be_notified_by_forum = get_notifications('forum', $forum_id);

@ -554,11 +554,7 @@ if (is_array($forumCategories)) {
}
}
if ($hideNotifications == false
&& !api_is_anonymous()
&& api_is_allowed_to_session_edit(false, true)
&& !api_get_configuration_value('disable_forum_notifications')
) {
if ($hideNotifications == false && !api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
$toolActions .= '<a href="'.api_get_self().'?'.api_get_cidreq()
.'&action=notify&content=forum&id='.$forum['forum_id'].'">'
.Display::return_icon($iconnotify, get_lang('NotifyMe'), null, ICON_SIZE_SMALL)

@ -634,10 +634,7 @@ if (is_array($threads)) {
}
}
$icon_liststd = 'user.png';
if (!api_is_anonymous()
&& api_is_allowed_to_session_edit(false, true)
&& !api_get_configuration_value('disable_forum_notifications')
) {
if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
$iconsEdit .= '<a href="'.api_get_self().'?'.$cidreq.'&forum='
.$my_forum
."&action=notify&content=thread&id={$row['thread_id']}"

@ -1200,9 +1200,6 @@ $_configuration['required_extra_fields_in_profile'] = [
// Requires new forum_category and forum_post "language" extra fields (multiple select)
//$_configuration['allow_forum_post_revisions'] = false;
// Disable "Notify me" options in forum tool (forums and threads).
//$_configuration['disable_forum_notifications'] = false;
// Allow to show users in a map, users need to have a coordinates extra field BT#15176
//$_configuration['allow_social_map_fields'] = ['fields' => ['terms_villedustage', 'terms_ville']];

Loading…
Cancel
Save