mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-nickvergessen/ticket/11201' into develop

Browse Source 
* github-nickvergessen/ticket/11201: (50 commits)
  [ticket/11201] Remove empty calls section from .yml
  [ticket/11201] Split template file into multiple files
  [ticket/11201] Remove dependency from types on the manager
  [ticket/11201] Rename profilefields class to manager
  [ticket/11201] Fix parameter description
  [ticket/11201] Use !== null, its faster
  [ticket/11201] Also translate profile fields in UCP and ACP
  [ticket/11201] Add parameters and variables to profile field class
  [ticket/11201] Add commas on last array entry
  [ticket/11201] Allow translation of profile field name and explanation
  [ticket/11201] Fix some variable names
  [ticket/11201] Add tables to constructor in tests
  [ticket/11201] Add a method to return the translated full name of the type
  [ticket/11201] Remove db depending code from field class
  [ticket/11201] Add variables to classes and add constructor doc blocks
  [ticket/11201] Update copyright in class file
  [ticket/11201] Add visibility and remove unused variable
  [ticket/11201] Add some commas at the last array entry
  [ticket/11201] Cast some variables to integer
  [ticket/11201] Inject table names rather then using constants
  ...

Conflicts:
	phpBB/config/services.yml
This commit is contained in:
Nils Adermann
2014-02-02 16:34:55 +01:00
parent 8a6b961c54 a59d6e94a5
commit 38af79dd30
42 changed files with 3021 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/schemas/firebird_schema.sql
View File

@@ -908,7 +908,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to(user_id, folder
CREATE TABLE phpbb_profile_fields (
field_id INTEGER NOT NULL,
field_name VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE,
field_type INTEGER DEFAULT 0 NOT NULL,
field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
field_ident VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL,
field_length VARCHAR(20) CHARACTER SET NONE DEFAULT '' NOT NULL,
field_minlen VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
@@ -957,7 +957,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id INTEGER DEFAULT 0 NOT NULL,
lang_id INTEGER DEFAULT 0 NOT NULL,
option_id INTEGER DEFAULT 0 NOT NULL,
field_type INTEGER DEFAULT 0 NOT NULL,
field_type VARCHAR(100) CHARACTER SET NONE DEFAULT '' NOT NULL,
lang_value VARCHAR(255) CHARACTER SET UTF8 DEFAULT '' NOT NULL COLLATE UNICODE
);;

4
phpBB/install/schemas/mssql_schema.sql
View File

@@ -1114,7 +1114,7 @@ GO
CREATE TABLE [phpbb_profile_fields] (
[field_id] [int] IDENTITY (1, 1) NOT NULL ,
[field_name] [varchar] (255) DEFAULT ('') NOT NULL ,
[field_type] [int] DEFAULT (0) NOT NULL ,
[field_type] [varchar] (100) DEFAULT ('') NOT NULL ,
[field_ident] [varchar] (20) DEFAULT ('') NOT NULL ,
[field_length] [varchar] (20) DEFAULT ('') NOT NULL ,
[field_minlen] [varchar] (255) DEFAULT ('') NOT NULL ,
@@ -1172,7 +1172,7 @@ CREATE TABLE [phpbb_profile_fields_lang] (
[field_id] [int] DEFAULT (0) NOT NULL ,
[lang_id] [int] DEFAULT (0) NOT NULL ,
[option_id] [int] DEFAULT (0) NOT NULL ,
[field_type] [int] DEFAULT (0) NOT NULL ,
[field_type] [varchar] (100) DEFAULT ('') NOT NULL ,
[lang_value] [varchar] (255) DEFAULT ('') NOT NULL
) ON [PRIMARY]
GO

4
phpBB/install/schemas/mysql_40_schema.sql
View File

@@ -645,7 +645,7 @@ CREATE TABLE phpbb_privmsgs_to (
CREATE TABLE phpbb_profile_fields (
field_id mediumint(8) UNSIGNED NOT NULL auto_increment,
field_name blob NOT NULL,
field_type tinyint(4) DEFAULT '0' NOT NULL,
field_type varbinary(100) DEFAULT '' NOT NULL,
field_ident varbinary(20) DEFAULT '' NOT NULL,
field_length varbinary(20) DEFAULT '' NOT NULL,
field_minlen varbinary(255) DEFAULT '' NOT NULL,
@@ -681,7 +681,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
field_type tinyint(4) DEFAULT '0' NOT NULL,
field_type varbinary(100) DEFAULT '' NOT NULL,
lang_value blob NOT NULL,
PRIMARY KEY (field_id, lang_id, option_id)
);

4
phpBB/install/schemas/mysql_41_schema.sql
View File

@@ -645,7 +645,7 @@ CREATE TABLE phpbb_privmsgs_to (
CREATE TABLE phpbb_profile_fields (
field_id mediumint(8) UNSIGNED NOT NULL auto_increment,
field_name varchar(255) DEFAULT '' NOT NULL,
field_type tinyint(4) DEFAULT '0' NOT NULL,
field_type varchar(100) DEFAULT '' NOT NULL,
field_ident varchar(20) DEFAULT '' NOT NULL,
field_length varchar(20) DEFAULT '' NOT NULL,
field_minlen varchar(255) DEFAULT '' NOT NULL,
@@ -681,7 +681,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
lang_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
field_type tinyint(4) DEFAULT '0' NOT NULL,
field_type varchar(100) DEFAULT '' NOT NULL,
lang_value varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (field_id, lang_id, option_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;

4
phpBB/install/schemas/oracle_schema.sql
View File

@@ -1217,7 +1217,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folde
CREATE TABLE phpbb_profile_fields (
field_id number(8) NOT NULL,
field_name varchar2(765) DEFAULT '' ,
field_type number(4) DEFAULT '0' NOT NULL,
field_type varchar2(100) DEFAULT '' ,
field_ident varchar2(20) DEFAULT '' ,
field_length varchar2(20) DEFAULT '' ,
field_minlen varchar2(255) DEFAULT '' ,
@@ -1277,7 +1277,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id number(8) DEFAULT '0' NOT NULL,
lang_id number(8) DEFAULT '0' NOT NULL,
option_id number(8) DEFAULT '0' NOT NULL,
field_type number(4) DEFAULT '0' NOT NULL,
field_type varchar2(100) DEFAULT '' ,
lang_value varchar2(765) DEFAULT '' ,
CONSTRAINT pk_phpbb_profile_fields_lang PRIMARY KEY (field_id, lang_id, option_id)
)

4
phpBB/install/schemas/postgres_schema.sql
View File

@@ -853,7 +853,7 @@ CREATE SEQUENCE phpbb_profile_fields_seq;
CREATE TABLE phpbb_profile_fields (
field_id INT4 DEFAULT nextval('phpbb_profile_fields_seq'),
field_name varchar(255) DEFAULT '' NOT NULL,
field_type INT2 DEFAULT '0' NOT NULL,
field_type varchar(100) DEFAULT '' NOT NULL,
field_ident varchar(20) DEFAULT '' NOT NULL,
field_length varchar(20) DEFAULT '' NOT NULL,
field_minlen varchar(255) DEFAULT '' NOT NULL,
@@ -893,7 +893,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id INT4 DEFAULT '0' NOT NULL CHECK (field_id >= 0),
lang_id INT4 DEFAULT '0' NOT NULL CHECK (lang_id >= 0),
option_id INT4 DEFAULT '0' NOT NULL CHECK (option_id >= 0),
field_type INT2 DEFAULT '0' NOT NULL,
field_type varchar(100) DEFAULT '' NOT NULL,
lang_value varchar(255) DEFAULT '' NOT NULL,
PRIMARY KEY (field_id, lang_id, option_id)
);

4
phpBB/install/schemas/sqlite_schema.sql
View File

@@ -626,7 +626,7 @@ CREATE INDEX phpbb_privmsgs_to_usr_flder_id ON phpbb_privmsgs_to (user_id, folde
CREATE TABLE phpbb_profile_fields (
field_id INTEGER PRIMARY KEY NOT NULL ,
field_name varchar(255) NOT NULL DEFAULT '',
field_type tinyint(4) NOT NULL DEFAULT '0',
field_type varchar(100) NOT NULL DEFAULT '',
field_ident varchar(20) NOT NULL DEFAULT '',
field_length varchar(20) NOT NULL DEFAULT '',
field_minlen varchar(255) NOT NULL DEFAULT '',
@@ -661,7 +661,7 @@ CREATE TABLE phpbb_profile_fields_lang (
field_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
lang_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
option_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
field_type tinyint(4) NOT NULL DEFAULT '0',
field_type varchar(100) NOT NULL DEFAULT '',
lang_value varchar(255) NOT NULL DEFAULT '',
PRIMARY KEY (field_id, lang_id, option_id)
);