By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10907] Mark (var)binary tests as incomplete on non-MySQL DBMSes.
By David King
via David King (1) and Nils Adermann (1)
* develop-olympus:
[task/functional] Use proper format for @var doc blocks.
[task/functional] Fix $lang_path variable
[task/functional] Change property visibility, remove globals, reword comment
[task/functional] Make sure missing language values are handled properly
[task/functional] Increase code coverage for functional tests
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
By David King
via David King
* github-imkingdavid/task/functional:
[task/functional] Use proper format for @var doc blocks.
[task/functional] Fix $lang_path variable
[task/functional] Change property visibility, remove globals, reword comment
[task/functional] Make sure missing language values are handled properly
[task/functional] Increase code coverage for functional tests
* rahulr92/ticket/10650:
[ticket/10650] Subject is cleared if no permissions exist
[ticket/10650] Changed apostrophe to utf8 single quote
[ticket/10650] Moving censoring to before truncation
[ticket/10650] Added apostrophe in explanation in language file
[ticket/10650] Inserted correct utf ELLIPSIS character
[ticket/10650] Added space after if and comment
[ticket/10650] Added ellipsis to language file
[ticket/10650] Added href title to subject link
[ticket/10650] Made use of truncate_string() function
[ticket/10650] Removed changes from acp_forums.php
[ticket/10650]Removed incorrect newline
[ticket/10650] Changed acp option from per forum to global
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
[ticket/10650] Changed language files and forumlist
[ticket/10650] Added static sql files
[ticket/10650] Displaying last topic on forum list
Conflicts:
phpBB/install/database_update.php
phpBB/language/en/common.php
* develop-olympus:
[ticket/10565] Add line breaks to query in order to follow coding guidelines.
[ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
* bantu/ticket/10565:
[ticket/10565] Add line breaks to query in order to follow coding guidelines.
[ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
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
Fix phpbb_dbal_select_test::test_sql_fetchrow_returns_false_when_empty() on
MSSQL and Oracle by specifying an existing table in the query.
PHPBB3-10890
Table ahs been styled. Date is now formatted properly instead of
the unix timestamp being displayed earlier. fixes small mistake in language
entry
PHPBB3-9647
