mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop

Browse Source 
# 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
This commit is contained in:
Nathan Guse
2013-01-14 12:16:59 -06:00
parent 62279d46a6 9eecaa21e3
commit a2f6e494f3
11 changed files with 80 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/database_update.php
View File

@@ -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);