Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions system/user/addons/forum/mod.forum.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class Forum
public $cur_thread_row = 0;
public $thread_post_total = 0; // Used for new entry submission to determine redirect page number
public $trigger_error_page = false;
public $trigger_login_page = false;
public $is_table_open = false;
public $preview_override = false;
public $mbr_class_loaded = false;
Expand All @@ -53,6 +54,7 @@ class Forum
public $spellcheck_enabled = false;
public $feeds_enabled = null;
public $feed_ids = '';
public $date_limit = '';
public $realm = "ExpressionEngine Forums";
public $auth_attempt = false;
public $use_sess_id = 0; // Used in calls to ee()->functions->fetch_site_index() in certain URLs, like attachments
Expand Down
8 changes: 5 additions & 3 deletions system/user/addons/forum/mod.forum_core.php
Original file line number Diff line number Diff line change
Expand Up @@ -6180,7 +6180,8 @@ public function move_reply()
}

if (false !== (strpos($new_topic_id, "/"))) {
$new_topic_id = end(explode("/", $new_topic_id));
$new_topic_id_parts = explode("/", $new_topic_id);
$new_topic_id = end($new_topic_id_parts);
}

if (! is_numeric($new_topic_id)) {
Expand Down Expand Up @@ -6491,7 +6492,8 @@ public function do_merge()
}

if (false !== (strpos($merge_id, "/"))) {
$merge_id = end(explode("/", $merge_id));
$merge_id_parts = explode("/", $merge_id);
$merge_id = end($merge_id_parts);
}

if (! is_numeric($merge_id)) {
Expand Down Expand Up @@ -9523,7 +9525,7 @@ public function http_authentication_check_digest($allowed_groups = array())
}

// make sure Super Admins are always allowed
if (! in_array($allowed_groups, 1)) {
if (! in_array(1, $allowed_groups)) {
$allowed_groups[] = 1;
}

Expand Down