diff --git a/sections/ajax/forum/thread.php b/sections/ajax/forum/thread.php index 790b11b5..dd801d55 100644 --- a/sections/ajax/forum/thread.php +++ b/sections/ajax/forum/thread.php @@ -45,6 +45,8 @@ $PerPage = POSTS_PER_PAGE; } + + //---------- Get some data to start processing // Thread information, constant across all pages @@ -241,6 +243,9 @@ foreach ($Thread as $Key => $Post) { list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime) = array_values($Post); list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID)); + + + $UserInfo = Users::user_info($EditedUserID); $JsonPosts[] = array( 'postId' => (int)$PostID, diff --git a/sections/forums/thread.php b/sections/forums/thread.php index 4d00d598..32144266 100644 --- a/sections/forums/thread.php +++ b/sections/forums/thread.php @@ -11,7 +11,6 @@ //---------- Things to sort out before it can start printing/generating content - // Enable TOC Text::$TOC = true; @@ -39,6 +38,7 @@ } + if (isset($LoggedUser['PostsPerPage'])) { $PerPage = $LoggedUser['PostsPerPage']; } else { diff --git a/sections/reportsv2/array.php b/sections/reportsv2/array.php index 8e70a244..cc858ff2 100644 --- a/sections/reportsv2/array.php +++ b/sections/reportsv2/array.php @@ -469,7 +469,7 @@ ), 'resolve_options' => array( 'upload' => '0', - 'warn' => '1', + 'warn' => '2', 'delete' => '1', 'pm' => '[rule]2.1.11[/rule]. Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed. The only allowable media formats are CD, DVD, Vinyl, Soundboard, SACD, DAT, Cassette, WEB, and Blu-ray.'