diff options
| author | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
|---|---|---|
| committer | Shibu Lijack <shibulijack@gmail.com> | 2012-04-10 21:46:14 +0530 |
| commit | fd55c8664a046258c12e8a207d44340010155627 (patch) | |
| tree | 1a520b8965b88f39cee72e5ce8bb093fb9c38d35 /phpBB/install/schemas/sqlite_schema.sql | |
| parent | daee25340381d4b97119be298a9fc2671e681bb3 (diff) | |
| parent | 41e03164c19751624968435f31f1b63367cd4eb2 (diff) | |
| download | forums-fd55c8664a046258c12e8a207d44340010155627.tar forums-fd55c8664a046258c12e8a207d44340010155627.tar.gz forums-fd55c8664a046258c12e8a207d44340010155627.tar.bz2 forums-fd55c8664a046258c12e8a207d44340010155627.tar.xz forums-fd55c8664a046258c12e8a207d44340010155627.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
phpBB/styles/prosilver/theme/tweaks.css
Diffstat (limited to 'phpBB/install/schemas/sqlite_schema.sql')
| -rw-r--r-- | phpBB/install/schemas/sqlite_schema.sql | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql index 56468bcdd9..bd002c93ed 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -737,36 +737,13 @@ CREATE TABLE phpbb_styles ( style_name varchar(255) NOT NULL DEFAULT '', style_copyright varchar(255) NOT NULL DEFAULT '', style_active INTEGER UNSIGNED NOT NULL DEFAULT '1', - template_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - theme_id INTEGER UNSIGNED NOT NULL DEFAULT '0' -); - -CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name); -CREATE INDEX phpbb_styles_template_id ON phpbb_styles (template_id); -CREATE INDEX phpbb_styles_theme_id ON phpbb_styles (theme_id); - -# Table: 'phpbb_styles_template' -CREATE TABLE phpbb_styles_template ( - template_id INTEGER PRIMARY KEY NOT NULL , - template_name varchar(255) NOT NULL DEFAULT '', - template_copyright varchar(255) NOT NULL DEFAULT '', - template_path varchar(100) NOT NULL DEFAULT '', + style_path varchar(100) NOT NULL DEFAULT '', bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=', - template_inherits_id INTEGER UNSIGNED NOT NULL DEFAULT '0', - template_inherit_path varchar(255) NOT NULL DEFAULT '' + style_parent_id INTEGER UNSIGNED NOT NULL DEFAULT '0', + style_parent_tree text(65535) NOT NULL DEFAULT '' ); -CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name); - -# Table: 'phpbb_styles_theme' -CREATE TABLE phpbb_styles_theme ( - theme_id INTEGER PRIMARY KEY NOT NULL , - theme_name varchar(255) NOT NULL DEFAULT '', - theme_copyright varchar(255) NOT NULL DEFAULT '', - theme_path varchar(100) NOT NULL DEFAULT '' -); - -CREATE UNIQUE INDEX phpbb_styles_theme_theme_name ON phpbb_styles_theme (theme_name); +CREATE UNIQUE INDEX phpbb_styles_style_name ON phpbb_styles (style_name); # Table: 'phpbb_topics' CREATE TABLE phpbb_topics ( |