makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 14:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11103] Add constants for the tables

Browse source 
PHPBB3-11103
This commit is contained in:
Nathan Guse 2012-12-13 19:56:39 -06:00
parent ddd874ba76
commit bec05a11f3
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/constants.php
View file

@ -239,6 +239,7 @@ define('LOG_TABLE', $table_prefix . 'log');
define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts'); define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
define('MODERATOR_CACHE_TABLE', $table_prefix . 'moderator_cache'); define('MODERATOR_CACHE_TABLE', $table_prefix . 'moderator_cache');
define('MODULES_TABLE', $table_prefix . 'modules'); define('MODULES_TABLE', $table_prefix . 'modules');
define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_options'); define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_options');
define('POLL_VOTES_TABLE', $table_prefix . 'poll_votes'); define('POLL_VOTES_TABLE', $table_prefix . 'poll_votes');
define('POSTS_TABLE', $table_prefix . 'posts'); define('POSTS_TABLE', $table_prefix . 'posts');
@ -272,6 +273,7 @@ define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted');
define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track'); define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_track');
define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch');
define('USER_GROUP_TABLE', $table_prefix . 'user_group'); define('USER_GROUP_TABLE', $table_prefix . 'user_group');
define('USER_NOTIFICATIONS_TABLE', $table_prefix . 'user_notifications');
define('USERS_TABLE', $table_prefix . 'users'); define('USERS_TABLE', $table_prefix . 'users');
define('WARNINGS_TABLE', $table_prefix . 'warnings'); define('WARNINGS_TABLE', $table_prefix . 'warnings');
define('WORDS_TABLE', $table_prefix . 'words'); define('WORDS_TABLE', $table_prefix . 'words');

14
phpBB/install/database_update.php
View file

@ -93,6 +93,14 @@ if (!defined('LOGIN_ATTEMPT_TABLE'))
{ {
define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts'); define('LOGIN_ATTEMPT_TABLE', $table_prefix . 'login_attempts');
} }
if (!defined('NOTIFICATIONS_TABLE'))
{
define('NOTIFICATIONS_TABLE', $table_prefix . 'notifications');
}
if (!defined('USER_NOTIFICATIONS_TABLE'))
{
define('USER_NOTIFICATIONS_TABLE', $table_prefix . 'user_notifications');
}
if (!defined('EXT_TABLE')) if (!defined('EXT_TABLE'))
{ {
define('EXT_TABLE', $table_prefix . 'ext'); define('EXT_TABLE', $table_prefix . 'ext');
@ -886,8 +894,6 @@ function _add_permission(auth_admin $auth_admin, phpbb_db_driver $db, $permissio
*****************************************************************************/ *****************************************************************************/
function database_update_info() function database_update_info()
{ {
global $table_prefix;
return array( return array(
// Changes from 3.0.0 to the next version // Changes from 3.0.0 to the next version
'3.0.0' => array( '3.0.0' => array(
@ -1173,7 +1179,7 @@ function database_update_info()
'ext_name' => array('UNIQUE', 'ext_name'), 'ext_name' => array('UNIQUE', 'ext_name'),
), ),
), ),
$table_prefix . 'notifications' => array( NOTIFICATIONS_TABLE => array(
'COLUMNS' => array( 'COLUMNS' => array(
'notification_id' => array('UINT', NULL, 'auto_increment'), 'notification_id' => array('UINT', NULL, 'auto_increment'),
'item_type' => array('VCHAR:255', ''), 'item_type' => array('VCHAR:255', ''),
@ -1191,7 +1197,7 @@ function database_update_info()
'user' => array('INDEX', array('user_id', 'unread')), 'user' => array('INDEX', array('user_id', 'unread')),
), ),
), ),
$table_prefix . 'user_notifications' => array( USER_NOTIFICATIONS_TABLE => array(
'COLUMNS' => array( 'COLUMNS' => array(
'item_type' => array('VCHAR:255', ''), 'item_type' => array('VCHAR:255', ''),
'item_id' => array('UINT', 0), 'item_id' => array('UINT', 0),