Commit graph

10812 commits

Author SHA1 Message Date
Igor Wiedler
76ad7c938d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:45:55 +01:00
Igor Wiedler
5a5560d200 Merge branch 'ticket/p/10058' into develop-olympus
* ticket/p/10058:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:44:58 +01:00
Oleg Pudeyev
c4b3d3a089 [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.

PHPBB3-10058
2011-02-24 17:31:44 -05:00
Andreas Fischer
cf5253c7b8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10056] Corrected a typo in Firebird name.
  [ticket/10041] Use send_status_line more in download/file.php

Conflicts:
	phpBB/download/file.php
2011-02-24 10:54:51 +01:00
Andreas Fischer
5e2bbdb22b Merge branch 'ticket/p/10041' into develop-olympus
* ticket/p/10041:
  [ticket/10041] Use send_status_line more in download/file.php
2011-02-24 10:35:27 +01:00
Andreas Fischer
b10654e9a5 Merge branch 'ticket/p/10056' into develop-olympus
* ticket/p/10056:
  [ticket/10056] Corrected a typo in Firebird name.
2011-02-24 10:35:09 +01:00
Oleg Pudeyev
ba41e45f84 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit

Conflicts:
	phpBB/install/database_update.php
2011-02-23 22:03:42 -05:00
Oleg Pudeyev
df92b7bdf2 Merge branch 'ticket/erikfrerejean/7778' into develop-olympus
* ticket/erikfrerejean/7778:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit
2011-02-23 22:02:39 -05:00
Erik Frèrejean
5dee60e54e [ticket/7778] Update all the schema files
Correct all the schema files to contain the new field type

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
1b88f5a316 [ticket/7778] Add the column change to mysql_upgrader.php
PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Oleg Pudeyev
a0f6e185ca [ticket/10056] Corrected a typo in Firebird name.
PHPBB3-10056
2011-02-23 20:16:23 -05:00
Oleg Pudeyev
786078d423 [ticket/10041] Use send_status_line more in download/file.php
PHPBB3-10041
2011-02-23 20:16:16 -05:00
Nils Adermann
aae3bd0c72 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10052] Add comments to the session testable factory.
  [ticket/10052] Correct session tests, and separate session factory from tests
2011-02-24 01:12:53 +01:00
Nils Adermann
510248da28 Merge branch 'ticket/naderman/10052' into develop-olympus
* ticket/naderman/10052:
  [ticket/10052] Add comments to the session testable factory.
  [ticket/10052] Correct session tests, and separate session factory from tests
2011-02-23 22:41:42 +01:00
Nils Adermann
cb56ab2dbd [ticket/10052] Add comments to the session testable factory.
PHPBB3-10052
2011-02-23 22:17:12 +01:00
Nils Adermann
11262afa93 [ticket/10052] Correct session tests, and separate session factory from tests
PHPBB3-10052
2011-02-23 18:33:20 +01:00
Oleg Pudeyev
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
Oleg Pudeyev
15a5d2c4bf Merge branch 'ticket/nickvergessen/9675' into develop-olympus
* ticket/nickvergessen/9675:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:31 -05:00
Andreas Fischer
a89be371e8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10049] Mark session init test incomplete for now.
  [ticket/10049] Mark session continue test incomplete for now.
  [ticket/10049] Globalize $_SID.
  [ticket/10049] Chase assertResultEquals rename.
  [ticket/10049] Fixed requires in session tests and mock.
  [ticket/10049] Renamed session test files to proper file names.
2011-02-20 18:33:59 +01:00
Andreas Fischer
69449417ba Merge branch 'ticket/p/10049' into develop-olympus
* ticket/p/10049:
  [ticket/10049] Mark session init test incomplete for now.
  [ticket/10049] Mark session continue test incomplete for now.
  [ticket/10049] Globalize $_SID.
  [ticket/10049] Chase assertResultEquals rename.
  [ticket/10049] Fixed requires in session tests and mock.
  [ticket/10049] Renamed session test files to proper file names.
2011-02-20 18:32:33 +01:00
Oleg Pudeyev
c025d6079b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:19 -05:00
Oleg Pudeyev
53a6cd607e Merge branch 'ticket/bantu/10047' into develop-olympus
* ticket/bantu/10047:
  [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
2011-02-20 11:40:01 -05:00
Oleg Pudeyev
6902ecf6a9 [ticket/10049] Mark session init test incomplete for now.
This test passes by itself but fails when run as part of the
compete suite. Mark it incomplete to avoid breaking the suite.

PHPBB3-10049
2011-02-20 08:53:15 -05:00
Oleg Pudeyev
c1e198e721 [ticket/10049] Mark session continue test incomplete for now.
I am unable to find any code revision in which this test worked.
Thus to not break the entire suite I mark it incomplete.

PHPBB3-10049
2011-02-20 08:45:59 -05:00
Oleg Pudeyev
f3ab9da0e9 [ticket/10049] Globalize $_SID.
PHPBB3-10049
2011-02-19 20:54:34 -05:00
Oleg Pudeyev
26b922ac3f [ticket/10049] Chase assertResultEquals rename.
cd694e9b9d renamed
assertResultEquals to assertSqlResultEquals. However, since the
session tests were never executed calls in them were never
updated.

Parameter order also changed; chase that too.

PHPBB3-10049
2011-02-19 20:54:08 -05:00
Oleg Pudeyev
0cf741f343 [ticket/10049] Fixed requires in session tests and mock.
PHPBB3-10049
2011-02-19 20:40:32 -05:00
Oleg Pudeyev
1abf7ad809 [ticket/10049] Renamed session test files to proper file names.
phpunit.xml.dist specifies that only files ending in _test.php
are test files; with the old names session tests were not run
as a result.

PHPBB3-10049
2011-02-19 20:30:46 -05:00
Andreas Fischer
aba31aeff9 [ticket/10047] Do not put session id in URL on posting.php when cookies are on.
PHPBB3-10047
2011-02-19 14:30:39 +01:00
Oleg Pudeyev
f24fe7b09e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP

Conflicts:
	phpBB/install/database_update.php
2011-02-17 17:11:55 -05:00
Oleg Pudeyev
676daf3076 Merge branch 'ticket/nickvergessen/9944' into develop-olympus
* ticket/nickvergessen/9944:
  [ticket/9944] Add empty line before the while() so you can better read the code
  [ticket/9944] Extension groups naming don't use users' language in ACP
2011-02-17 17:03:08 -05:00
Andreas Fischer
9c268a21dd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10044] Updated invocation documentation.
  [ticket/10044] Stop when failed to retrieve network/collaborators.
  [ticket/10044] Added -h to setup_github_network.php.
  [ticket/10044] Error handling for remote requests in setup_github_network.php
  [ticket/10044] Made setup_github_network.php runnable as a script
2011-02-17 14:57:47 +01:00
Andreas Fischer
622da172d2 Merge branch 'ticket/p/10044' into develop-olympus
* ticket/p/10044:
  [ticket/10044] Updated invocation documentation.
  [ticket/10044] Stop when failed to retrieve network/collaborators.
  [ticket/10044] Added -h to setup_github_network.php.
  [ticket/10044] Error handling for remote requests in setup_github_network.php
  [ticket/10044] Made setup_github_network.php runnable as a script
2011-02-17 14:56:30 +01:00
Oleg Pudeyev
5af3cfe9ca [ticket/10044] Updated invocation documentation.
PHPBB3-10044
2011-02-16 21:13:35 -05:00
Igor Wiedler
19a0c16ed6 Merge branch 'ticket/nickvergessen/10045' into develop
* ticket/nickvergessen/10045:
  [ticket/10045] Update version in some more files.
  [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
2011-02-16 16:13:37 +01:00
Joas Schilling
59454ccd99 [ticket/10045] Update version in some more files.
I did not include the docs/INSTALL.html, because we need to do a bit more on that file before releasing 3.1 (Add section how to update from 3.0 to 3.1, ...)

PHPBB3-10045
2011-02-16 16:06:23 +01:00
Nils Adermann
bd51bbda4e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/refactor-db-testcase] Further improve error messages.
  [task/refactor-db-testcase] Do not show db password on connect error
  [task/refactor-db-testcase] Improve error message of db tests
  [task/refactor-db-testcase] Refactor phpbb_database_test_case
2011-02-16 11:55:43 +01:00
Nils Adermann
f3a3ec438f Merge branch 'task/refactor-db-testcase' into develop-olympus
* task/refactor-db-testcase:
  [task/refactor-db-testcase] Further improve error messages.
  [task/refactor-db-testcase] Do not show db password on connect error
  [task/refactor-db-testcase] Improve error message of db tests
  [task/refactor-db-testcase] Refactor phpbb_database_test_case
2011-02-16 11:53:54 +01:00
Joas Schilling
528c54f0f7 [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
PHPBB3-10045
2011-02-16 11:29:49 +01:00
Oleg Pudeyev
bd8e5ff79e [task/refactor-db-testcase] Further improve error messages.
PHPBB3-10043
2011-02-15 21:08:33 -05:00
Oleg Pudeyev
ed53cef0aa [ticket/10044] Stop when failed to retrieve network/collaborators.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
bf137b7005 [ticket/10044] Added -h to setup_github_network.php.
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
30c46a6e0c [ticket/10044] Error handling for remote requests in setup_github_network.php
PHPBB3-10044
2011-02-15 05:20:30 -05:00
Oleg Pudeyev
0f3378ca28 [ticket/10044] Made setup_github_network.php runnable as a script
PHPBB3-10044
2011-02-15 04:45:54 -05:00
Joas Schilling
bcbbeacaf8 [ticket/9944] Add empty line before the while() so you can better read the code
PHPBB3-9944
2011-02-14 16:40:12 +01:00
Igor Wiedler
d3718bf5d4 [task/refactor-db-testcase] Do not show db password on connect error
PHPBB3-10043
2011-02-14 15:25:05 +01:00
Igor Wiedler
17b17bc939 [task/refactor-db-testcase] Improve error message of db tests
If database tests cannot be run the error message is ambigous. This
commit makes it clearer:

- whether the supplied dbms is supported by us
- which dbms are supported by us
- whether the required PDO extension is loaded

PHPBB3-10043
2011-02-14 14:48:42 +01:00
Igor Wiedler
6c7f49f561 [task/refactor-db-testcase] Refactor phpbb_database_test_case
Move most of the methods to a separate connection manager class. The
test case creates a manager to handle database creation, schema loading
and more. Most of the methods could be simplified because they can
access shared pdo, config and dbms data.

PHPBB3-10043
2011-02-14 00:24:55 +01:00
Igor Wiedler
1cc5087c36 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8904] Show default value for numeric custom profile fields when editing
2011-02-13 18:33:27 +01:00