Empty commit

This commit is contained in:
Git 2014-06-02 08:00:27 +00:00
parent 6517078996
commit ede37637d3
3 changed files with 7 additions and 2 deletions

View File

@ -45,6 +45,8 @@
$PerPage = POSTS_PER_PAGE; $PerPage = POSTS_PER_PAGE;
} }
//---------- Get some data to start processing //---------- Get some data to start processing
// Thread information, constant across all pages // Thread information, constant across all pages
@ -241,6 +243,9 @@
foreach ($Thread as $Key => $Post) { foreach ($Thread as $Key => $Post) {
list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime) = array_values($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)); list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
$UserInfo = Users::user_info($EditedUserID); $UserInfo = Users::user_info($EditedUserID);
$JsonPosts[] = array( $JsonPosts[] = array(
'postId' => (int)$PostID, 'postId' => (int)$PostID,

View File

@ -11,7 +11,6 @@
//---------- Things to sort out before it can start printing/generating content //---------- Things to sort out before it can start printing/generating content
// Enable TOC // Enable TOC
Text::$TOC = true; Text::$TOC = true;
@ -39,6 +38,7 @@
} }
if (isset($LoggedUser['PostsPerPage'])) { if (isset($LoggedUser['PostsPerPage'])) {
$PerPage = $LoggedUser['PostsPerPage']; $PerPage = $LoggedUser['PostsPerPage'];
} else { } else {

View File

@ -469,7 +469,7 @@
), ),
'resolve_options' => array( 'resolve_options' => array(
'upload' => '0', 'upload' => '0',
'warn' => '1', 'warn' => '2',
'delete' => '1', 'delete' => '1',
'pm' => '[rule]2.1.11[/rule]. Music ripped from the radio (Satellite or FM), television, the web, or podcasts are not allowed. '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.' The only allowable media formats are CD, DVD, Vinyl, Soundboard, SACD, DAT, Cassette, WEB, and Blu-ray.'