diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 16:23:33 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 16:23:33 -0500 |
| commit | 196ed8ef9f063eb4293e740725d1f1c31276fed9 (patch) | |
| tree | 5a541e3db2f5419151706f051fb9428a77bb9bd4 /phpBB/develop | |
| parent | 1d388d98ab25bd6414dc60a5f21620b8397c326c (diff) | |
| parent | 27775e89a50021cab7938079d2da431c3bd75a47 (diff) | |
| download | forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.gz forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.bz2 forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.xz forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.zip | |
Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
[ticket/10845] Removed one empty line that wasn't supposed to be there
[ticket/10845] Two of the three colouns were missing in the DB update file
[ticket/10845] Remove censor from text
[ticket/10845] Now it shows the preview post parsed
[ticket/10845] Changed the report system. Now it saves posts with the bbcode
Conflicts:
phpBB/includes/functions_content.php
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 6eb4a80199..3d3e478032 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -1520,16 +1520,18 @@ function get_schema_struct() $schema_data['phpbb_reports'] = array( 'COLUMNS' => array( - 'report_id' => array('UINT', NULL, 'auto_increment'), - 'reason_id' => array('USINT', 0), - 'post_id' => array('UINT', 0), - 'pm_id' => array('UINT', 0), - 'user_id' => array('UINT', 0), - 'user_notify' => array('BOOL', 0), - 'report_closed' => array('BOOL', 0), - 'report_time' => array('TIMESTAMP', 0), - 'report_text' => array('MTEXT_UNI', ''), - 'reported_post_text' => array('MTEXT_UNI', ''), + 'report_id' => array('UINT', NULL, 'auto_increment'), + 'reason_id' => array('USINT', 0), + 'post_id' => array('UINT', 0), + 'pm_id' => array('UINT', 0), + 'user_id' => array('UINT', 0), + 'user_notify' => array('BOOL', 0), + 'report_closed' => array('BOOL', 0), + 'report_time' => array('TIMESTAMP', 0), + 'report_text' => array('MTEXT_UNI', ''), + 'reported_post_text' => array('MTEXT_UNI', ''), + 'reported_post_uid' => array('VCHAR:8', ''), + 'reported_post_bitfield' => array('VCHAR:255', ''), ), 'PRIMARY_KEY' => 'report_id', 'KEYS' => array( |