mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-16 05:34:01 +02:00
Merge branch 'develop' into feature/avatars
* develop: (335 commits) [ticket/10575] Adding public visibility to the methods. [ticket/10575] Fixing non-static access to static functions get_instance [ticket/10547] User is not logged in as admin after installation [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop [ticket/10650] Added checking for empty subjects [ticket/10650] Corrected intendation [ticket/10650]Added permission checking and utf8 functions [ticket/10650] Cropped subject and inserted newline [ticket/10650] Corrected space before true [ticket/10650] Changed language files and forumlist [ticket/10650] Added static sql files [ticket/10650] Displaying last topic on forum list [ticket/10760] Fix numbering in php fun facts. [ticket/10760] Value must be quoted as it might be two words. [ticket/10760] PHP is great. This commit is the proof. [ticket/10760] Catch both versions of parse error output in php. [ticket/10607] Added 'Powered by' translation string. [ticket/10760] Account for display_errors=stderr in pre-commit hook. [ticket/10760] Quote PHP_BIN when using it. [ticket/10760] Use echo -e only if echo understands -e. ...
This commit is contained in:
@@ -1108,7 +1108,8 @@ CREATE TABLE [phpbb_reports] (
|
||||
[user_notify] [int] DEFAULT (0) NOT NULL ,
|
||||
[report_closed] [int] DEFAULT (0) NOT NULL ,
|
||||
[report_time] [int] DEFAULT (0) NOT NULL ,
|
||||
[report_text] [text] DEFAULT ('') NOT NULL
|
||||
[report_text] [text] DEFAULT ('') NOT NULL ,
|
||||
[reported_post_text] [text] DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]
|
||||
GO
|
||||
|
||||
@@ -1322,8 +1323,10 @@ CREATE TABLE [phpbb_styles] (
|
||||
[style_name] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[style_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[style_active] [int] DEFAULT (1) NOT NULL ,
|
||||
[template_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[theme_id] [int] DEFAULT (0) NOT NULL
|
||||
[style_path] [varchar] (100) DEFAULT ('') NOT NULL ,
|
||||
[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
|
||||
[style_parent_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[style_parent_tree] [varchar] (8000) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
@@ -1337,59 +1340,6 @@ GO
|
||||
CREATE UNIQUE INDEX [style_name] ON [phpbb_styles]([style_name]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [template_id] ON [phpbb_styles]([template_id]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE INDEX [theme_id] ON [phpbb_styles]([theme_id]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_styles_template'
|
||||
*/
|
||||
CREATE TABLE [phpbb_styles_template] (
|
||||
[template_id] [int] IDENTITY (1, 1) NOT NULL ,
|
||||
[template_name] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
|
||||
[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
|
||||
[template_inherits_id] [int] DEFAULT (0) NOT NULL ,
|
||||
[template_inherit_path] [varchar] (255) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_styles_template] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_styles_template] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[template_id]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE UNIQUE INDEX [tmplte_nm] ON [phpbb_styles_template]([template_name]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_styles_theme'
|
||||
*/
|
||||
CREATE TABLE [phpbb_styles_theme] (
|
||||
[theme_id] [int] IDENTITY (1, 1) NOT NULL ,
|
||||
[theme_name] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[theme_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
|
||||
[theme_path] [varchar] (100) DEFAULT ('') NOT NULL
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
ALTER TABLE [phpbb_styles_theme] WITH NOCHECK ADD
|
||||
CONSTRAINT [PK_phpbb_styles_theme] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[theme_id]
|
||||
) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
CREATE UNIQUE INDEX [theme_name] ON [phpbb_styles_theme]([theme_name]) ON [PRIMARY]
|
||||
GO
|
||||
|
||||
|
||||
/*
|
||||
Table: 'phpbb_topics'
|
||||
|
Reference in New Issue
Block a user