aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #796 from imkingdavid/ticket/10837Nils Adermann2012-06-111-9/+0
|\ | | | | [ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
| * [ticket/10837] Removed tearDownAfterClass() from extension_controller_test.phpDavid King2012-05-071-9/+0
| | | | | | | | PHPBB3-10837
* | Merge PR #834 branch 'bantu/ticket/10931' into developOleg Pudeyev2012-06-114-0/+290
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10931: [ticket/10931] Apply strtolower() correctly, i.e. not on false. [ticket/10931] Also test get_bytes() and get_string() with false. [ticket/10931] Make to_numeric function globally available. [ticket/10931] Make sure get_bytes() always returns either an int or a float. [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes(). [ticket/10931] Use strict assertSame() instead of assertEquals(). [ticket/10931] Also test for negative values. [ticket/10931] Also test lower case units in test_get_bytes(). [ticket/10931] Correctly use GNU GPL version 2. [ticket/10931] Make it clear that we are mocking the ini_get() function. [ticket/10931] Document that false is also returned if value is not well formed [ticket/10931] Correct method description of get_string(). [ticket/10931] Let us try ini_get() without error suppression. [ticket/10931] Unit tests for phpbb_php_ini class. [ticket/10931] Add wrapper class for ini_get function.
| * | [ticket/10931] Apply strtolower() correctly, i.e. not on false.Andreas Fischer2012-06-111-4/+5
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Also test get_bytes() and get_string() with false.Andreas Fischer2012-06-111-0/+2
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Make to_numeric function globally available.Andreas Fischer2012-06-113-15/+16
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Make sure get_bytes() always returns either an int or a float.Andreas Fischer2012-06-112-9/+39
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Correctly handle inputs such as '-k' as invalid in get_bytes().Andreas Fischer2012-06-111-0/+7
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Use strict assertSame() instead of assertEquals().Andreas Fischer2012-06-111-19/+19
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Also test for negative values.Andreas Fischer2012-06-111-0/+7
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Also test lower case units in test_get_bytes().Andreas Fischer2012-06-111-1/+2
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Correctly use GNU GPL version 2.Andreas Fischer2012-06-113-3/+3
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Make it clear that we are mocking the ini_get() function.Andreas Fischer2012-06-112-3/+3
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Document that false is also returned if value is not well formedAndreas Fischer2012-06-111-0/+3
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Correct method description of get_string().Andreas Fischer2012-06-111-2/+1
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Let us try ini_get() without error suppression.Andreas Fischer2012-06-111-1/+1
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Unit tests for phpbb_php_ini class.Andreas Fischer2012-06-112-0/+74
| | | | | | | | | | | | PHPBB3-10931
| * | [ticket/10931] Add wrapper class for ini_get function.Andreas Fischer2012-06-111-0/+165
|/ / | | | | | | | | | | Provides easier handling of the different interpretations of ini values. PHPBB3-10931
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-313-24/+141
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. [develop-olympus] Add changelog for 3.0.11 release. [develop-olympus] Bump version numbers for 3.0.11-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.11 releases. Conflicts: phpBB/docs/INSTALL.html 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
| * | [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.Andreas Fischer2012-05-313-3/+3
| | |
| * | [develop-olympus] Add changelog for 3.0.11 release.Andreas Fischer2012-05-311-19/+136
| | |
| * | [develop-olympus] Bump version numbers for 3.0.11-RC1 release.Andreas Fischer2012-05-314-8/+8
| | |
| * | [develop-olympus] Bumping version numbers to final for 3.0.11 releases.Andreas Fischer2012-05-3110-11/+11
| | |
* | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | By Andreas Fischer via Nils Adermann (2) and Andreas Fischer (1) * develop-olympus: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
| * | Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympusNils Adermann2012-05-311-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10788: [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
| | * | [ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.Andreas Fischer2012-05-311-0/+1
| | | | | | | | | | | | | | | | PHPBB3-10788
| * | | Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympusNils Adermann2012-05-311-6/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
* | \ \ \ Merge remote-tracking branch 'github-bantu/ticket/10790' into developNils Adermann2012-05-311-6/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10790: [ticket/10790] Remove a (kind of) dead code section from submit_pm().
| * | | | [ticket/10790] Remove a (kind of) dead code section from submit_pm().Andreas Fischer2012-05-221-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of $user->data['user_id'] is (almost) guranteed to be integer since session::session_create() casts it to integer. The type of $row['user_id'] is only an integer if the DB driver adjusts the PHP type according to the DB type. This is only done by some of our not-so-popular DB drivers and is not the case for MySQL. As such this comparison is (almost) never true and a PM is also sent to the author itself when it is sent to a group the author is also a member of. Since this behaviour seems to have been accepted by the communty, the dead code is removed and current behaviour is kept. Also, checking this in the loop seems to be a rather bad idea. Introduced by 78b1c4caaa17cc8760b685ad41c19f15f9d89b68. PHPBB3-10790
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10550] Sort not installed styles list in the styles section of the ACP. Conflicts: phpBB/includes/acp/acp_styles.php
| * | | | Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympusNils Adermann2012-05-311-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10550: [ticket/10550] Sort not installed styles list in the styles section of the ACP.
| | * | | | [ticket/10550] Sort not installed styles list in the styles section of the ACP.Andreas Fischer2012-05-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10550
* | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-311-3/+9
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10611] Filter out not existing database tables when making a backup. [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables(). [ticket/10611] Generate db_tools instance in acp_database module.
| * | | | | Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympusNils Adermann2012-05-311-3/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10611: [ticket/10611] Filter out not existing database tables when making a backup. [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables(). [ticket/10611] Generate db_tools instance in acp_database module.
| | * | | | | [ticket/10611] Filter out not existing database tables when making a backup.Andreas Fischer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using $this->db_tools->sql_list_tables() as the first argument gives us table names as array keys as a by-product which might be useful at some point. PHPBB3-10611
| | * | | | | [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().Andreas Fischer2012-05-301-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_tables() was deprecated by phpbb_db_tools::sql_list_tables() This prevents unnecessarily loading functions_install.php PHPBB3-10611
| | * | | | | [ticket/10611] Generate db_tools instance in acp_database module.Andreas Fischer2012-05-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10611
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-312-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
| * | | | | | Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympusNils Adermann2012-05-312-1/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10162: [ticket/10162] Increase maximum length of email address TLD from 6 to 63. [ticket/10162] Add test cases for top level domain names longer than 6 chars.
| | * | | | | | [ticket/10162] Increase maximum length of email address TLD from 6 to 63.Andreas Fischer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase maximum length of email address top level domains from 6 to 63. PHPBB3-10162
| | * | | | | | [ticket/10162] Add test cases for top level domain names longer than 6 chars.Andreas Fischer2012-05-301-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10162
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-05-315-1/+38
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer (1) and Nils Adermann (1) * develop-olympus: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer. Conflicts: phpBB/includes/db/dbal.php
| * | | | | | Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympusNils Adermann2012-05-315-1/+38
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Andreas Fischer via Andreas Fischer * github-bantu/ticket/10751: [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column. [ticket/10751] Add sql_lower_text() to database abstraction layer.
| | * | | | | | [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.Andreas Fischer2012-05-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10751
| | * | | | | | [ticket/10751] Add sql_lower_text() to database abstraction layer.Andreas Fischer2012-05-314-0/+36
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char). So, in order to use it on a text column, we have to convert it to an appropriate type. We do so using the SUBSTRING function. PHPBB3-10751
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-313-6/+31
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| * | | | | | Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympusAndreas Fischer2012-05-313-6/+31
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10908: [ticket/10908] Document that 0 filesize configuration means limited by PHP [ticket/10908] Download files only up to max_upload_filesize if limit is 0
| | * | | | | [ticket/10908] Document that 0 filesize configuration means limited by PHPNils Adermann2012-05-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10908
| | * | | | | [ticket/10908] Download files only up to max_upload_filesize if limit is 0Nils Adermann2012-05-291-4/+29
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-10908
* | | | | | Merge branch 'develop-olympus' into developDavid King2012-05-291-2/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/session.php