aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-12-089-77/+301
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal. Conflicts: tests/fixtures/empty.xml
| * Merge remote-tracking branch 'p/ticket/10205' into develop-olympusAndreas Fischer2012-12-089-76/+305
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10205: [ticket/10205] Reduce nesting in mysql drivers. [ticket/10205] Rewrite _sql_error implementations to have a single return. [ticket/10205] Cosmetic changes. [ticket/10205] Add some columns to the empty fixture file for mssqlnative. [ticket/10205] Delete stray return. [ticket/10205] Test failed connection attempts. [ticket/10205] Check for function existence in mssql connect method. [ticket/10205] Convert mssqlnative driver to the same logic. [ticket/10205] Fix a parse error in oracle driver. [ticket/10205] Fix remaining db drivers. [ticket/10205] Avoid calling mysqli functions when mysqli is missing. [ticket/10205] Account for potentially missing extensions in dbal.
| | * [ticket/10205] Reduce nesting in mysql drivers.Oleg Pudeyev2012-12-042-28/+22
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Rewrite _sql_error implementations to have a single return.Oleg Pudeyev2012-12-045-20/+34
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Cosmetic changes.Oleg Pudeyev2012-12-046-9/+10
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Add some columns to the empty fixture file for mssqlnative.Oleg Pudeyev2012-12-041-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Supposedly it choked on the version without any columns thusly: phpbb_dbal_connect_test::test_failing_connect PDOException: SQLSTATE[HY090]: [Microsoft][ODBC Driver Manager] Invalid string or buffer length PHPBB3-10205
| | * [ticket/10205] Delete stray return.Oleg Pudeyev2012-12-041-2/+0
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Test failed connection attempts.Oleg Pudeyev2012-12-042-0/+49
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Check for function existence in mssql connect method.Oleg Pudeyev2012-12-041-0/+8
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Convert mssqlnative driver to the same logic.Oleg Pudeyev2012-12-041-20/+32
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Fix a parse error in oracle driver.Oleg Pudeyev2012-12-041-1/+1
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Fix remaining db drivers.Oleg Pudeyev2012-12-045-43/+93
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Avoid calling mysqli functions when mysqli is missing.Oleg Pudeyev2012-12-041-4/+14
| | | | | | | | | | | | PHPBB3-10205
| | * [ticket/10205] Account for potentially missing extensions in dbal.Oleg Pudeyev2012-12-045-4/+93
| | | | | | | | | | | | PHPBB3-10205
* | | Merge PR #1127 branch 'igorw/ticket/11256' into developOleg Pudeyev2012-12-071-9/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11256: [ticket/11256] Remove unused controller.provider service [ticket/11256] Remove unused service with non-existent class
| * | | [ticket/11256] Remove unused controller.provider serviceIgor Wiedler2012-12-071-3/+0
| | | | | | | | | | | | | | | | PHPBB3-11256
| * | | [ticket/11256] Remove unused service with non-existent classIgor Wiedler2012-12-071-6/+0
|/ / / | | | | | | | | | PHPBB3-11256
* | | Merge branch 'develop-olympus' into developIgor Wiedler2012-12-070-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11248] Line endings to LF. Conflicts: tests/session/append_sid_test.php
| * | Merge remote-tracking branch 'p/ticket/11248' into develop-olympusIgor Wiedler2012-12-071-51/+50
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/11248: [ticket/11248] Line endings to LF.
| | * | [ticket/11248] Line endings to LF.Oleg Pudeyev2012-12-051-51/+50
| | | | | | | | | | | | | | | | PHPBB3-11248
* | | | Merge PR #607 branch 'nickvergessen/ticket/10679' into developOleg Pudeyev2012-12-076-6/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10679: [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1 [ticket/10679] Use module_auth to limit access to the module [ticket/10679] Add new permission for changing profile field information
| * | | | [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1Joas Schilling2012-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10679
| * | | | [ticket/10679] Use module_auth to limit access to the moduleJoas Schilling2012-12-063-7/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-10679
| * | | | [ticket/10679] Add new permission for changing profile field informationJoas Schilling2012-12-066-5/+59
|/ / / / | | | | | | | | | | | | | | | | | | | | The setting is copied from "Can use signature" PHPBB3-10679
* | | | Merge PR #1101 branch 'develop-olympus' into developOleg Pudeyev2012-12-063-1/+181
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11219] Coding guidelines and naming consistency changes [ticket/11219] Only update sequences that are affected by a fixture [ticket/11219] Recreate Oracle sequences instead of altering them [ticket/11219] Add unit test for inserting into a sequence column [ticket/11219] Update sequence values after loading fixtures
| * | | Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympusOleg Pudeyev2012-12-063-1/+181
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/11219: [ticket/11219] Coding guidelines and naming consistency changes [ticket/11219] Only update sequences that are affected by a fixture [ticket/11219] Recreate Oracle sequences instead of altering them [ticket/11219] Add unit test for inserting into a sequence column [ticket/11219] Update sequence values after loading fixtures
| | * | [ticket/11219] Coding guidelines and naming consistency changesPatrick Webster2012-12-052-12/+14
| | | | | | | | | | | | | | | | PHPBB3-11219
| | * | [ticket/11219] Only update sequences that are affected by a fixturePatrick Webster2012-12-012-36/+55
| | | | | | | | | | | | | | | | PHPBB3-11219
| | * | [ticket/11219] Recreate Oracle sequences instead of altering themPatrick Webster2012-11-201-53/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous method would always leave a gap between the last value and the new one due to how you have to update the sequence values. To remove gaps in all situations, the options are to alter the USER_SEQUENCES table or just drop the sequence and recreate it. The prior requires elevated priveleges and the latter can break attached objects. Since we don't attach objects to the sequences, we won't have any problems doing it for the tests. PHPBB3-11219
| | * | [ticket/11219] Add unit test for inserting into a sequence columnJoas Schilling2012-11-191-0/+55
| | | | | | | | | | | | | | | | PHPBB3-11219
| | * | [ticket/11219] Update sequence values after loading fixturesPatrick Webster2012-11-182-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a value is provide for an auto_increment type of column, certain DBMSes do not update their internal sequencers. If a row is inserted later, it can be given an ID that is already in use, resulting in an error. The database test cases now resynchronise the sequencers before the tests are run. PHPBB3-11219
* | | | Merge PR #1053 branch 'develop-olympus' into developOleg Pudeyev2012-12-053-6/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP Conflicts: phpBB/includes/ucp/ucp_prefs.php phpBB/styles/prosilver/template/ucp_prefs_personal.html
| * | | Merge PR #1053 branch 'p/ticket/10841' into develop-olympusOleg Pudeyev2012-12-053-6/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10841: [ticket/10841] Revert more whitespace changes. [ticket/10841] Revert whitespace changes. [ticket/10841] adding space after if [ticket/10841] removing unnecessary spacing [ticket/10841] changing affectedrows check to COUNT in sql [ticket/10841] Modifying style and language selectors in UCP
| | * | | [ticket/10841] Revert more whitespace changes.Oleg Pudeyev2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
| | * | | [ticket/10841] Revert whitespace changes.Oleg Pudeyev2012-12-052-20/+20
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
| | * | | [ticket/10841] adding space after ifSenky2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
| | * | | [ticket/10841] removing unnecessary spacingSenky2012-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-10841
| | * | | [ticket/10841] changing affectedrows check to COUNT in sqlSenky2012-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841
| | * | | [ticket/10841] Modifying style and language selectors in UCPSenky2012-12-053-28/+62
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Commit also deletes all unnecessary blank spaces at the end of the lines in both ucp_prefs_personal.html PHPBB3-10841
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-3/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. Conflicts: phpBB/includes/functions_messenger.php
| * | | Merge remote-tracking branch 'p/ticket/10602' into develop-olympusAndreas Fischer2012-12-051-3/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10602: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose.
| | * | | [ticket/10602] Avoid a race condition.Oleg Pudeyev2012-12-051-2/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10602
| | * | | [ticket/10602] Use last_queue_run for its intended purpose.Oleg Pudeyev2012-12-051-3/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep the last queue run time around, therefore for determining whether enough time has passed since the last run we can simply use this config variable. When there is no queue file we consider a queue run successful. Previously queue.php ("cache file") modification time would be used for determining whether enough time has passed since last queue run. The problem was that modification time would be updated whenever anything was added to the queue, creating a situation where if queue is processed less frequently than it is added to that email would not be sent. PHPBB3-10602
* | | | Merge remote-tracking branch 'p/ticket/11247' into developAndreas Fischer2012-12-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/11247: [ticket/11247] Fix wrong property reference in flock class.
| * | | | [ticket/11247] Fix wrong property reference in flock class.Oleg Pudeyev2012-12-051-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-11247
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-051-0/+74
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10716] Only lint on php 5.3+. [ticket/10716] php parse all php files as part of the test suite.
| * | | Merge remote-tracking branch 'p/ticket/10716' into develop-olympusAndreas Fischer2012-12-051-0/+74
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10716: [ticket/10716] Collect standard error from executed php process. [ticket/10716] Skip test if php is not in PATH. [ticket/10716] Exclude our dependencies from linting. [ticket/10716] Only lint on php 5.3+. [ticket/10716] php parse all php files as part of the test suite.
| | * | [ticket/10716] Collect standard error from executed php process.Oleg Pudeyev2012-12-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php executes everything via a shell. The standard error of this top level shell is not captured by exec/shell_exec/popen/etc. and there is no way to capture it. proc_open might work but it is a nightmare to use and without multiplexing reads from standard error and standard output it can deadlock. Thus the solution in this commit. Put the command into a subshell and redirect standard error to standard output for the subshell. PHPBB3-10716
| | * | [ticket/10716] Skip test if php is not in PATH.Oleg Pudeyev2012-12-041-0/+8
| | | | | | | | | | | | | | | | PHPBB3-10716
| | * | [ticket/10716] Exclude our dependencies from linting.Oleg Pudeyev2012-12-041-1/+12
| | | | | | | | | | | | | | | | PHPBB3-10716
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-22 01:29:56 +0000