Merged
Conversation
sql_save() no longer takes $query_result as a reference, thus this assignment is a no-op. PHPBB3-10875
phpbb_cache_driver_null::sql_save() has to return $query_result as is instead of null. PHPBB3-10875
Previously (develop-olympus) $query_result was passed via reference into sql_save(). Now the (possibly changed) result is returned by value. Adjust logic to take this change into account correctly. PHPBB3-10875
This localizes template_path to style resource locator. locate function on template will be removed in a subsequent commit. PHPBB3-10933
template_path is now only present in style resource locator. PHPBB3-10933
template_path is now only present in style resource locator and should not be assigned to. PHPBB3-10933
template_path is now private. Change semantics of passing false for template path - now this resets template path to default which I think makes sense. PHPBB3-10933
It had no callers other than the test suite. PHPBB3-10933
…ator. There is no reason for it to go through a template instance to test resource locator functionality. PHPBB3-10933
…e locator PHPBB3-10933
Also rewrite get_first_template_location prose a little to be less repetitive with get_first_file_location. PHPBB3-10933
Add breadcrumb data to subsilver2 PHPBB3-11175
Add breadcrumb microdata to prosilver PHPBB3-11175
* cyberalien/ticket/11175: [ticket/11175] Add microdata to prosilver [ticket/11175] Add microdata to subsilver2
PHPBB3-11192
PHPBB3-11192
The disable images need to be clone rather then moved, in order to allow multiple disable images per page. We do not have such a case at the moment but it will be required for the new teampage/legend ACP section. PHPBB3-11209
…ypes. PHPBB3-11192
… now. PHPBB3-11192
* bantu/ticket/11192: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
* develop-olympus: [ticket/11192] Merge dataProvider arrays because the test is the same now. [ticket/11192] Update $value parameter description to support other types. [ticket/11192] Mark negative byte numbers as unsupported. [ticket/11192] Test strings not converted to int/float before. [ticket/11192] Also test strings, e.g. sums returned by the database. [ticket/11192] Also test powers of 10 / 1000. [ticket/11192] Add tests. [ticket/11192] Add Tebibyte to get_formatted_filesize().
* imkingdavid/ticket/11211: [ticket/11211] Fix typo in phpbb_realpath() method name
PHPBB3-10103
PHPBB3-10716
PHPBB3-10103
* p/ticket/10103: [ticket/10103] New and improved wording. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. [ticket/10103] Try a longer sleep for travis. [ticket/10103] Convert the rest of the tree to flock class. [ticket/10103] Test for flock lock class, with concurrency no less. [ticket/10103] Use flock lock class in messenger. [ticket/10103] Factor out flock lock class.
PHPBB3-10716
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
* 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.
* 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.
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
PHPBB3-10602
* p/ticket/11247: [ticket/11247] Fix wrong property reference in flock class.
* p/ticket/10602: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose.
* develop-olympus: [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. Conflicts: phpBB/includes/functions_messenger.php
Commit also deletes all unnecessary blank spaces at the end of the lines in both ucp_prefs_personal.html PHPBB3-10841
this sould reduce load and be faster. Also freeresult functions added PHPBB3-10841
PHPBB3-10841
PHPBB3-10841
PHPBB3-10841
PHPBB3-10841
* 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
* 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
* 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
* 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
* upstream/develop: (196 commits) [ticket/11219] Coding guidelines and naming consistency changes [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/11247] Fix wrong property reference in flock class. [ticket/10602] Avoid a race condition. [ticket/10602] Use last_queue_run for its intended purpose. [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/10103] New and improved wording. [ticket/10716] Only lint on php 5.3+. [ticket/10103] Assert with messages. [ticket/10103] assertLessThan/assertGreaterThan. [ticket/10103] Inline assignment is bad? [ticket/10103] $rv had too few characters. [ticket/10103] Correct flock class documentation. ... Conflicts: phpBB/includes/functions.php tests/cache/cache_test.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Develop merge conflict fixed