aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-07-29 12:36:07 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-07-29 12:36:07 +0000
commit86dddd43b621fb3a91b8257f4dd534e4a1077809 (patch)
tree64d998a756a8313574609ebf562f26766f1b3ab4
parent7997796789d7bad2acd68eb56f9728ae518bfe36 (diff)
downloadforums-86dddd43b621fb3a91b8257f4dd534e4a1077809.tar
forums-86dddd43b621fb3a91b8257f4dd534e4a1077809.tar.gz
forums-86dddd43b621fb3a91b8257f4dd534e4a1077809.tar.bz2
forums-86dddd43b621fb3a91b8257f4dd534e4a1077809.tar.xz
forums-86dddd43b621fb3a91b8257f4dd534e4a1077809.zip
forgot a few things
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8708 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat
-rw-r--r--phpBB/download/file.php23
-rw-r--r--phpBB/install/schemas/firebird_schema.sql4
-rw-r--r--phpBB/install/schemas/mssql_schema.sql4
-rw-r--r--phpBB/install/schemas/mysql_40_schema.sql2
-rw-r--r--phpBB/install/schemas/mysql_41_schema.sql2
-rw-r--r--phpBB/install/schemas/oracle_schema.sql2
-rw-r--r--phpBB/install/schemas/postgres_schema.sql2
-rw-r--r--phpBB/install/schemas/sqlite_schema.sql4
8 files changed, 28 insertions, 15 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php
index b0ea17e7fc..73c8f94188 100644
--- a/phpBB/download/file.php
+++ b/phpBB/download/file.php
@@ -75,20 +75,19 @@ if (isset($_GET['avatar']))
}
- if ($exit)
- {
- file_gc();
- }
-
- if (!$filename)
- {
- // no way such an avatar could exist. They are not following the rules, stop the show.
- header("HTTP/1.0 403 Forbidden");
- }
- else
+ if (!$exit)
{
- send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
+ if (!$filename)
+ {
+ // no way such an avatar could exist. They are not following the rules, stop the show.
+ header("HTTP/1.0 403 Forbidden");
+ }
+ else
+ {
+ send_avatar_to_browser(($avatar_group ? 'g' : '') . $filename . '.' . $ext, $browser);
+ }
}
+ file_gc();
}
// implicit else: we are not in avatar mode
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 1d2ec37eaa..091f1cb4a1 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -1076,7 +1076,9 @@ CREATE TABLE phpbb_styles_template (
template_copyright VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
template_path VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
bbcode_bitfield VARCHAR(255) CHARACTER SET NONE DEFAULT 'kNg=' NOT NULL,
- template_storedb INTEGER DEFAULT 0 NOT NULL
+ template_storedb INTEGER DEFAULT 0 NOT NULL,
+ template_inherits_id INTEGER DEFAULT 0 NOT NULL,
+ template_inherit_path VARCHAR(255) CHARACTER SET NONE NOT NULL
);;
ALTER TABLE phpbb_styles_template ADD PRIMARY KEY (template_id);;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 6890148243..4281871115 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -1295,7 +1295,9 @@ CREATE TABLE [phpbb_styles_template] (
[template_copyright] [varchar] (255) DEFAULT ('') NOT NULL ,
[template_path] [varchar] (100) DEFAULT ('') NOT NULL ,
[bbcode_bitfield] [varchar] (255) DEFAULT ('kNg=') NOT NULL ,
- [template_storedb] [int] DEFAULT (0) NOT NULL
+ [template_storedb] [int] DEFAULT (0) NOT NULL ,
+ [template_inherits_id] [int] DEFAULT (0) NOT NULL ,
+ [template_inherit_path] [varchar] (255) NOT NULL
) ON [PRIMARY]
GO
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 7e4ddeb3cd..b66560f045 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -739,6 +739,8 @@ CREATE TABLE phpbb_styles_template (
template_path varbinary(100) DEFAULT '' NOT NULL,
bbcode_bitfield varbinary(255) DEFAULT 'kNg=' NOT NULL,
template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+ template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
+ template_inherit_path varbinary(255) NOT NULL,
PRIMARY KEY (template_id),
UNIQUE tmplte_nm (template_name(255))
);
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index ba51ea2102..240a77f0cd 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -739,6 +739,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar(100) DEFAULT '' NOT NULL,
bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
template_storedb tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+ template_inherits_id int(4) UNSIGNED DEFAULT '0' NOT NULL,
+ template_inherit_path varchar(255) NOT NULL,
PRIMARY KEY (template_id),
UNIQUE tmplte_nm (template_name)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 19f09bcebd..6ac1c46f42 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -1431,6 +1431,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar2(100) DEFAULT '' ,
bbcode_bitfield varchar2(255) DEFAULT 'kNg=' NOT NULL,
template_storedb number(1) DEFAULT '0' NOT NULL,
+ template_inherits_id number(4) DEFAULT '0' NOT NULL,
+ template_inherit_path varchar2(255) NOT NULL,
CONSTRAINT pk_phpbb_styles_template PRIMARY KEY (template_id),
CONSTRAINT u_phpbb_tmplte_nm UNIQUE (template_name)
)
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index f11f1b4d35..c457bf5cab 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -972,6 +972,8 @@ CREATE TABLE phpbb_styles_template (
template_path varchar(100) DEFAULT '' NOT NULL,
bbcode_bitfield varchar(255) DEFAULT 'kNg=' NOT NULL,
template_storedb INT2 DEFAULT '0' NOT NULL CHECK (template_storedb >= 0),
+ template_inherits_id INT4 DEFAULT '0' NOT NULL CHECK (template_inherits_id >= 0),
+ template_inherit_path varchar(255) NOT NULL,
PRIMARY KEY (template_id)
);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index d7ac93f672..d04d166303 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -713,7 +713,9 @@ CREATE TABLE phpbb_styles_template (
template_copyright varchar(255) NOT NULL DEFAULT '',
template_path varchar(100) NOT NULL DEFAULT '',
bbcode_bitfield varchar(255) NOT NULL DEFAULT 'kNg=',
- template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0'
+ template_storedb INTEGER UNSIGNED NOT NULL DEFAULT '0',
+ template_inherits_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+ template_inherit_path varchar(255) NOT NULL
);
CREATE UNIQUE INDEX phpbb_styles_template_tmplte_nm ON phpbb_styles_template (template_name);
generated by cgit v1.2.1 (git 2.21.0) at 2025-05-21 12:39:43 +0000