diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-14 12:16:59 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-14 12:16:59 -0600 |
| commit | a2f6e494f37914352b0bb72d5a84904d3f2c51a3 (patch) | |
| tree | 24ebda96b46c244fd4247fbae3991c376530af75 /phpBB/install/database_update.php | |
| parent | 62279d46a60e695a71c4748f8722975a37f488bc (diff) | |
| parent | 9eecaa21e3fe23c0c1afc7f8d057754fca68e9a6 (diff) | |
| download | forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.gz forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.bz2 forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.tar.xz forums-a2f6e494f37914352b0bb72d5a84904d3f2c51a3.zip | |
Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
[ticket/11171] Moved the DB schema changes to its place
[ticket/11171] Cleanup of leftovers
[ticket/11171] Adapted the code in report.php
[ticket/11171] Use the options stored to decide how to show it
[ticket/11171] DB changes for the update
[ticket/11171] DB additions for these changes
Conflicts:
phpBB/install/schemas/firebird_schema.sql
phpBB/install/schemas/mssql_schema.sql
phpBB/install/schemas/mysql_40_schema.sql
phpBB/install/schemas/mysql_41_schema.sql
phpBB/install/schemas/oracle_schema.sql
phpBB/install/schemas/postgres_schema.sql
phpBB/install/schemas/sqlite_schema.sql
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8950d677ae..4e17a1429c 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1180,9 +1180,12 @@ function database_update_info() 'style_parent_tree' => array('TEXT', ''), ), REPORTS_TABLE => array( - 'reported_post_text' => array('MTEXT_UNI', ''), - 'reported_post_uid' => array('VCHAR:8', ''), - 'reported_post_bitfield' => array('VCHAR:255', ''), + 'reported_post_text' => array('MTEXT_UNI', ''), + 'reported_post_uid' => array('VCHAR:8', ''), + 'reported_post_bitfield' => array('VCHAR:255', ''), + 'reported_post_enable_bbcode' => array('BOOL', 1), + 'reported_post_enable_smilies' => array('BOOL', 1), + 'reported_post_enable_magic_url' => array('BOOL', 1), ), ), 'change_columns' => array( @@ -2926,6 +2929,7 @@ function change_database_data(&$no_updates, $version) _sql($sql, $errored, $error_ary); } $db->sql_freeresult($result); + // Add new permissions include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); |