diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-02-07 00:07:59 +0100 |
| commit | c56db535b4f0c943777ab159c14729d724f5d232 (patch) | |
| tree | 56a63ae78f97a990d3ca1512c5333aebd467895a /phpBB/install/database_update.php | |
| parent | 11aff559d4fcde5c2935aa6ebdfcfbe162d91f64 (diff) | |
| parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
| download | forums-c56db535b4f0c943777ab159c14729d724f5d232.tar forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.gz forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.bz2 forums-c56db535b4f0c943777ab159c14729d724f5d232.tar.xz forums-c56db535b4f0c943777ab159c14729d724f5d232.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/config/services.yml
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 7ca40070c4..28baf101a8 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( @@ -2961,6 +2964,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); |