1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

11350 Commits

Author SHA1 Message Date
Andreas Fischer
835faff61a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
2011-06-15 18:51:45 +02:00
Andreas Fischer
79f757d4b7 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php

Conflicts:
	phpBB/install/database_update.php
2011-06-15 18:51:04 +02:00
Andreas Fischer
2d6df4c7fc Merge remote-tracking branch 'Marshalrusty/ticket/10218' into prep-release-3.0.9
* Marshalrusty/ticket/10218:
  [ticket/10218] Prevent startime from being overwritten by deregister_globals()
  [ticket/10218] Moving global deregistration, etc. to startup.php
2011-06-15 18:50:14 +02:00
Andreas Fischer
9b2a72e6ff Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10220] Limit user agent value length for storage in login attempt table
2011-06-15 18:47:30 +02:00
Andreas Fischer
1e8c257bd4 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10220] Limit user agent value length for storage in login attempt table
2011-06-15 18:47:27 +02:00
Andreas Fischer
d2eebd7682 Merge remote-tracking branch 'naderman/ticket/10220' into prep-release-3.0.9
* naderman/ticket/10220:
  [ticket/10220] Limit user agent value length for storage in login attempt table
2011-06-15 18:47:26 +02:00
Andreas Fischer
34c89b5950 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10219] Remove invalid and invisible character from web.config.
2011-06-15 18:47:26 +02:00
Andreas Fischer
bf3bac8772 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10219] Remove invalid and invisible character from web.config.
2011-06-15 18:47:24 +02:00
Nils Adermann
74785a8bda [ticket/10220] Limit user agent value length for storage in login attempt table
PHPBB3-10220
2011-06-15 18:20:16 +02:00
Igor Wiedler
62a51e681e Merge remote-tracking branch 'bantu/ticket/10219' into prep-release-3.0.9
* bantu/ticket/10219:
  [ticket/10219] Remove invalid and invisible character from web.config.
2011-06-15 08:02:00 +02:00
Yuriy Rusko
4bb98fb046 [ticket/10218] Prevent startime from being overwritten by deregister_globals()
PHPBB3-10218
2011-06-15 00:50:12 -04:00
Andreas Fischer
bc7aebe0fb [ticket/10219] Remove invalid and invisible character from web.config.
PHPBB3-10219
2011-06-14 23:18:33 +02:00
Yuriy Rusko
f8eb154714 [ticket/10218] Moving global deregistration, etc. to startup.php
Because startup.php deletes all variables, the constants in
database_update are used to preserve settings at the top.

PHPBB3-10218
2011-06-14 06:11:35 -04:00
Andreas Fischer
32f610fe14 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-06-13 22:30:29 +02:00
Andreas Fischer
bf61602a28 [develop-olympus] Incrementing the version to 3.0.10-dev in develop-olympus. 2011-06-13 22:23:28 +02:00
Andreas Fischer
8a54aa5d68 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
2011-06-13 19:50:06 +02:00
Andreas Fischer
5223f7558b Merge remote-tracking branch 'naderman/ticket/10214' into develop-olympus
* naderman/ticket/10214:
  [ticket/10214] Correct Oracle create table query syntax in db_tools
release-3.0.9-RC1
2011-06-13 19:49:52 +02:00
Nils Adermann
c090e1c9e9 [ticket/10214] Correct Oracle create table query syntax in db_tools
Removes the semicolon at end of oracle CREATE TABLE queries and adds a
semicolon to the end of a SELECT query inside of the trigger for a new
table's auto increment column before the end keyword

PHPBB3-10214
2011-06-13 06:14:59 +02:00
Andreas Fischer
5c010250ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10213] Update install schema with shorter index names.
2011-06-13 02:20:35 +02:00
Andreas Fischer
7cc45ee0d5 Merge remote-tracking branch 'naderman/ticket/10213' into develop-olympus
* naderman/ticket/10213:
  [ticket/10213] Update install schema with shorter index names.
2011-06-13 02:15:35 +02:00
Nils Adermann
47edadfc9e [ticket/10213] Update install schema with shorter index names.
PHPBB3-10213
2011-06-13 01:52:18 +02:00
Andreas Fischer
ddea203492 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9892] _sql in the updater needs to return the transaction results
2011-06-13 00:09:46 +02:00
Andreas Fischer
25bd58d2f9 Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympus
* naderman/ticket/9892:
  [ticket/9892] _sql in the updater needs to return the transaction results
2011-06-13 00:09:37 +02:00
Nils Adermann
c9e22ac509 [ticket/9892] _sql in the updater needs to return the transaction results
PHPBB3-9892
2011-06-12 23:45:23 +02:00
Andreas Fischer
8453587264 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9992] The table name constant needs to be defined in the updater
2011-06-12 23:19:46 +02:00
Andreas Fischer
d724c3afac Merge remote-tracking branch 'naderman/ticket/9992' into develop-olympus
* naderman/ticket/9992:
  [ticket/9992] The table name constant needs to be defined in the updater
2011-06-12 23:19:37 +02:00
Nils Adermann
b65cf4c8d6 [ticket/9992] The table name constant needs to be defined in the updater
When the database update is run before updating the files the constant
is not yet defined.

PHPBB3-9992
2011-06-12 23:09:52 +02:00
Andreas Fischer
f9f5909f9a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Also build packages for 3.0.7.
2011-06-12 23:08:08 +02:00
Andreas Fischer
cab3b1bf7b [develop-olympus] Also build packages for 3.0.7. 2011-06-12 23:07:48 +02:00
Andreas Fischer
c6075003a3 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Changelog: Changes since 3.0.8
  [develop-olympus] Bumping version number for 3.0.9-RC1.
  [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2011-06-12 22:27:29 +02:00
Andreas Fischer
939bb65b17 [develop-olympus] Changelog: Changes since 3.0.8 2011-06-12 22:09:25 +02:00
Andreas Fischer
7232ca4102 [develop-olympus] Bumping version number for 3.0.9-RC1. 2011-06-12 19:45:01 +02:00
Andreas Fischer
b774520621 [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases. 2011-06-12 19:45:01 +02:00
Andreas Fischer
ecc9a7dd9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10211] Add spce after dot in new language string
2011-06-12 19:42:55 +02:00
Andreas Fischer
a9d7c90f2a Merge remote-tracking branch 'naderman/ticket/10211' into develop-olympus
* naderman/ticket/10211:
  [ticket/10211] Add spce after dot in new language string
2011-06-12 19:42:43 +02:00
Nils Adermann
8475a8bec5 [ticket/10211] Add spce after dot in new language string
PHPBB3-10211
2011-06-12 19:36:22 +02:00
Andreas Fischer
9b469eb163 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9892] Correct copyright year
  [ticket/9892] Remove incorrect use of camel case
  [ticket/9892] Removing closing php tag from create_schema_files
  [ticket/9892] Transaction support for database update sql execution function
  [ticket/9892] count is a keyword in firebird, so renaming this alias
  [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
  [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
  [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
  [ticket/9892] Adding a number of tests for db_tools
  [ticket/9892] Table prefix lengths influence index lengths in db_tools
  [ticket/9892] Shorten the index names on the q&a captcha
  [ticket/9892] column & index name limits, firebird auto increment in db_tools

Conflicts:
	phpBB/develop/create_schema_files.php
2011-06-12 19:27:01 +02:00
Andreas Fischer
4adfa46850 Merge remote-tracking branch 'naderman/ticket/9892' into develop-olympus
* naderman/ticket/9892:
  [ticket/9892] Correct copyright year
  [ticket/9892] Remove incorrect use of camel case
  [ticket/9892] Removing closing php tag from create_schema_files
  [ticket/9892] Transaction support for database update sql execution function
  [ticket/9892] count is a keyword in firebird, so renaming this alias
  [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
  [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
  [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
  [ticket/9892] Adding a number of tests for db_tools
  [ticket/9892] Table prefix lengths influence index lengths in db_tools
  [ticket/9892] Shorten the index names on the q&a captcha
  [ticket/9892] column & index name limits, firebird auto increment in db_tools
2011-06-12 19:24:00 +02:00
Nils Adermann
4e0717b4d7 [ticket/9892] Correct copyright year
PHPBB3-9892
2011-06-12 12:26:49 +02:00
Nils Adermann
11750bdccc [ticket/9892] Remove incorrect use of camel case
PHPBB3-9892
2011-06-12 12:24:57 +02:00
Nils Adermann
76cc7be4d2 [ticket/9892] Removing closing php tag from create_schema_files
PHPBB3-9892
2011-06-12 11:46:55 +02:00
Nils Adermann
2569d7460a [ticket/9892] Transaction support for database update sql execution function
Updates would fail before because 'begin' as generated by
db_tools::sql_create_table would be executed literally.

PHPBB3-9892
2011-06-12 11:40:57 +02:00
Nils Adermann
ef977abe59 [ticket/9892] count is a keyword in firebird, so renaming this alias
PHPBB3-9892
2011-06-12 11:33:55 +02:00
Nils Adermann
cd3d23810f [ticket/9892] Q&A CAPTCHA did not work on firebird, so no need to change config
PHPBB3-9892
2011-06-12 11:10:18 +02:00
Nils Adermann
6cab45b28e [ticket/9892] Shorten login_attempt key names to avoid firebird length problems
PHPBB3-9892
2011-06-12 11:02:30 +02:00
Nils Adermann
32f37bf938 [ticket/9892] Drop Q&A CAPTCHA tables if left in inconsistent state
PHPBB3-9892
2011-06-12 11:02:21 +02:00
Nils Adermann
025649e14c [ticket/9892] Adding a number of tests for db_tools
The test creates a table and runs a number of queries on it to judge whether
the selected column types can hold the data they are expected to contain.
Additional test methods check the auto increment feature and a few of the
basic commands of db_tools. This is only a starting point. Plenty more
tests need to be added.

PHPBB3-9892
2011-06-12 10:34:43 +02:00
Nils Adermann
ef544ee095 [ticket/9892] Table prefix lengths influence index lengths in db_tools
PHPBB3-9892
2011-06-12 04:10:51 +02:00
Nils Adermann
8a5e3781d5 [ticket/9892] Shorten the index names on the q&a captcha
PHPBB3-9892
2011-06-12 01:28:06 +02:00
Nils Adermann
418c3d546a [ticket/9892] column & index name limits, firebird auto increment in db_tools
- Column names are limited to 30 characters
- Index names are limited to 31 characters.
  On some dbms the index name contains both table name and actual index name
  so the limit applies to the sum of the lenghts of table name and index name.
- Auto incremented column names are limited to 26 characters to provide an
  additional 4 characters for sequence names

The code for firebird auto increment support using generators/sequences with
triggers was copied from create_schema_files.php

PHPBB3-9892
2011-06-12 01:28:01 +02:00