diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-29 13:14:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-29 13:14:33 +0000 |
| commit | 859902ea243824b48d2b67d806cd622746bed00f (patch) | |
| tree | f2b3d40656d471499fdf61389166f0818f88a168 /phpBB/includes/constants.php | |
| parent | 7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c (diff) | |
| download | forums-859902ea243824b48d2b67d806cd622746bed00f.tar forums-859902ea243824b48d2b67d806cd622746bed00f.tar.gz forums-859902ea243824b48d2b67d806cd622746bed00f.tar.bz2 forums-859902ea243824b48d2b67d806cd622746bed00f.tar.xz forums-859902ea243824b48d2b67d806cd622746bed00f.zip | |
reverting changes to the installer
do not introduce a function we never call outside of common.php
git-svn-id: file:///svn/phpbb/trunk@5859 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/constants.php')
| -rw-r--r-- | phpBB/includes/constants.php | 142 |
1 files changed, 68 insertions, 74 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index da19cfde4d..75b3c9ef02 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -132,79 +132,73 @@ define('FIELD_DATE', 6); // Additional constants -// Table names - only set if not in installation -if (!defined('IN_INSTALL')) -{ - // Table names - define('ACL_GROUPS_TABLE', $table_prefix . 'auth_groups'); - define('ACL_OPTIONS_TABLE', $table_prefix . 'auth_options'); - define('ACL_ROLES_TABLE', $table_prefix . 'auth_roles'); - define('ACL_ROLES_DATA_TABLE', $table_prefix . 'auth_roles_data'); - define('ACL_USERS_TABLE', $table_prefix . 'auth_users'); - define('ATTACHMENTS_TABLE', $table_prefix . 'attachments'); - define('BANLIST_TABLE', $table_prefix . 'banlist'); - define('BBCODES_TABLE', $table_prefix . 'bbcodes'); - define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); - define('BOTS_TABLE', $table_prefix . 'bots'); - define('CACHE_TABLE', $table_prefix . 'cache'); - define('CONFIG_TABLE', $table_prefix . 'config'); - define('CONFIRM_TABLE', $table_prefix . 'confirm'); - define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); - define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang'); - define('PROFILE_DATA_TABLE', $table_prefix . 'profile_fields_data'); - define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang'); - define('DISALLOW_TABLE', $table_prefix . 'disallow'); - define('DRAFTS_TABLE', $table_prefix . 'drafts'); - define('EXTENSIONS_TABLE', $table_prefix . 'extensions'); - define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups'); - define('FORUMS_TABLE', $table_prefix . 'forums'); - define('FORUMS_ACCESS_TABLE', $table_prefix . 'forum_access'); - define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_marking'); - define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch'); - define('GROUPS_TABLE', $table_prefix . 'groups'); - define('ICONS_TABLE', $table_prefix . 'icons'); - define('LANG_TABLE', $table_prefix . 'lang'); - define('LOG_TABLE', $table_prefix . 'log'); - define('MODERATOR_TABLE', $table_prefix . 'moderator_cache'); - define('MODULES_TABLE', $table_prefix . 'modules'); - define('POSTS_TABLE', $table_prefix . 'posts'); - define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs'); - define('PRIVMSGS_TO_TABLE', $table_prefix . 'privmsgs_to'); - define('PRIVMSGS_FOLDER_TABLE', $table_prefix . 'privmsgs_folder'); - define('PRIVMSGS_RULES_TABLE', $table_prefix . 'privmsgs_rules'); - define('RANKS_TABLE', $table_prefix . 'ranks'); - define('RATINGS_TABLE', $table_prefix . 'ratings'); - define('REPORTS_TABLE', $table_prefix . 'reports'); - define('REASONS_TABLE', $table_prefix . 'reports_reasons'); - define('SEARCH_TABLE', $table_prefix . 'search_results'); - define('SEARCH_WORD_TABLE', $table_prefix . 'search_wordlist'); - define('SEARCH_MATCH_TABLE', $table_prefix . 'search_wordmatch'); - define('SESSIONS_TABLE', $table_prefix . 'sessions'); - define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys'); - define('SITELIST_TABLE', $table_prefix . 'sitelist'); - define('SMILIES_TABLE', $table_prefix . 'smilies'); - define('STYLES_TABLE', $table_prefix . 'styles'); - define('STYLES_TPL_TABLE', $table_prefix . 'styles_template'); - define('STYLES_TPLDATA_TABLE', $table_prefix . 'styles_template_data'); - define('STYLES_CSS_TABLE', $table_prefix . 'styles_theme'); - define('STYLES_IMAGE_TABLE', $table_prefix . 'styles_imageset'); - define('TOPICS_TABLE', $table_prefix . 'topics'); - define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); - define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); - define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_marking'); - define('USER_GROUP_TABLE', $table_prefix . 'user_group'); - define('USERS_TABLE', $table_prefix . 'users'); - define('USERS_NOTES_TABLE', $table_prefix . 'users_notes'); - define('WARNINGS_TABLE', $table_prefix . 'warnings'); - define('WORDS_TABLE', $table_prefix . 'words'); - define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_results'); - define('POLL_VOTES_TABLE', $table_prefix . 'poll_voters'); - define('ZEBRA_TABLE', $table_prefix . 'zebra'); - - // Additional tables - - - // Additional tables end -} +// Table names +define('ACL_GROUPS_TABLE', $table_prefix . 'auth_groups'); +define('ACL_OPTIONS_TABLE', $table_prefix . 'auth_options'); +define('ACL_ROLES_TABLE', $table_prefix . 'auth_roles'); +define('ACL_ROLES_DATA_TABLE', $table_prefix . 'auth_roles_data'); +define('ACL_USERS_TABLE', $table_prefix . 'auth_users'); +define('ATTACHMENTS_TABLE', $table_prefix . 'attachments'); +define('BANLIST_TABLE', $table_prefix . 'banlist'); +define('BBCODES_TABLE', $table_prefix . 'bbcodes'); +define('BOOKMARKS_TABLE', $table_prefix . 'bookmarks'); +define('BOTS_TABLE', $table_prefix . 'bots'); +define('CACHE_TABLE', $table_prefix . 'cache'); +define('CONFIG_TABLE', $table_prefix . 'config'); +define('CONFIRM_TABLE', $table_prefix . 'confirm'); +define('PROFILE_FIELDS_TABLE', $table_prefix . 'profile_fields'); +define('PROFILE_LANG_TABLE', $table_prefix . 'profile_lang'); +define('PROFILE_DATA_TABLE', $table_prefix . 'profile_fields_data'); +define('PROFILE_FIELDS_LANG_TABLE', $table_prefix . 'profile_fields_lang'); +define('DISALLOW_TABLE', $table_prefix . 'disallow'); +define('DRAFTS_TABLE', $table_prefix . 'drafts'); +define('EXTENSIONS_TABLE', $table_prefix . 'extensions'); +define('EXTENSION_GROUPS_TABLE', $table_prefix . 'extension_groups'); +define('FORUMS_TABLE', $table_prefix . 'forums'); +define('FORUMS_ACCESS_TABLE', $table_prefix . 'forum_access'); +define('FORUMS_TRACK_TABLE', $table_prefix . 'forums_marking'); +define('FORUMS_WATCH_TABLE', $table_prefix . 'forums_watch'); +define('GROUPS_TABLE', $table_prefix . 'groups'); +define('ICONS_TABLE', $table_prefix . 'icons'); +define('LANG_TABLE', $table_prefix . 'lang'); +define('LOG_TABLE', $table_prefix . 'log'); +define('MODERATOR_TABLE', $table_prefix . 'moderator_cache'); +define('MODULES_TABLE', $table_prefix . 'modules'); +define('POSTS_TABLE', $table_prefix . 'posts'); +define('PRIVMSGS_TABLE', $table_prefix . 'privmsgs'); +define('PRIVMSGS_TO_TABLE', $table_prefix . 'privmsgs_to'); +define('PRIVMSGS_FOLDER_TABLE', $table_prefix . 'privmsgs_folder'); +define('PRIVMSGS_RULES_TABLE', $table_prefix . 'privmsgs_rules'); +define('RANKS_TABLE', $table_prefix . 'ranks'); +define('RATINGS_TABLE', $table_prefix . 'ratings'); +define('REPORTS_TABLE', $table_prefix . 'reports'); +define('REASONS_TABLE', $table_prefix . 'reports_reasons'); +define('SEARCH_TABLE', $table_prefix . 'search_results'); +define('SEARCH_WORD_TABLE', $table_prefix . 'search_wordlist'); +define('SEARCH_MATCH_TABLE', $table_prefix . 'search_wordmatch'); +define('SESSIONS_TABLE', $table_prefix . 'sessions'); +define('SESSIONS_KEYS_TABLE', $table_prefix . 'sessions_keys'); +define('SITELIST_TABLE', $table_prefix . 'sitelist'); +define('SMILIES_TABLE', $table_prefix . 'smilies'); +define('STYLES_TABLE', $table_prefix . 'styles'); +define('STYLES_TPL_TABLE', $table_prefix . 'styles_template'); +define('STYLES_TPLDATA_TABLE', $table_prefix . 'styles_template_data'); +define('STYLES_CSS_TABLE', $table_prefix . 'styles_theme'); +define('STYLES_IMAGE_TABLE', $table_prefix . 'styles_imageset'); +define('TOPICS_TABLE', $table_prefix . 'topics'); +define('TOPICS_POSTED_TABLE', $table_prefix . 'topics_posted'); +define('TOPICS_WATCH_TABLE', $table_prefix . 'topics_watch'); +define('TOPICS_TRACK_TABLE', $table_prefix . 'topics_marking'); +define('USER_GROUP_TABLE', $table_prefix . 'user_group'); +define('USERS_TABLE', $table_prefix . 'users'); +define('USERS_NOTES_TABLE', $table_prefix . 'users_notes'); +define('WARNINGS_TABLE', $table_prefix . 'warnings'); +define('WORDS_TABLE', $table_prefix . 'words'); +define('POLL_OPTIONS_TABLE', $table_prefix . 'poll_results'); +define('POLL_VOTES_TABLE', $table_prefix . 'poll_voters'); +define('ZEBRA_TABLE', $table_prefix . 'zebra'); + +// Additional tables + ?>
\ No newline at end of file |