* develop: (95 commits)
[ticket/9084] Explain the logic.
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[feature/append_var] Adding test case
[ticket/7432] Delete redundant reference to "appropriate menu item".
[ticket/10618] Change phpBB 3 to phpBB 3.1.
[ticket/10685] Refactor template test defaults for php 5.4 compatibility.
[feature/append_var] Adding append_var template class function
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
[ticket/8652] Comment for also updating forum watch table in user_notification.
[ticket/8652] Sending 2 emails on 2 replies
[ticket/10680] Add /phpBB/ext/* to .gitignore
[ticket/10672] Fix total post count language string in statistics and feed
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
[ticket/10453] Fixing spacing
...
Conflicts:
tests/bootstrap.php
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading
PHPBB3-9550
* develop-olympus:
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
* bantu/ticket/9813:
[ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
[ticket/9813] Only get posts table row count if we detected a fulltext index.
[ticket/9813] Also use estimated row count of posts table for fulltext mysql.
[ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
[ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
[ticket/10653] Add ability to count table rows to database abstraction layer.
[ticket/9813] Use table status row count only if greater than 100000 or exact.
[ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.
PHPBB3-9813
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.
PHPBB3-8652
* develop-olympus:
[ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
Conflicts:
phpBB/styles/prosilver/template/memberlist_leaders.html
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.
PHPBB3-9220
* develop-olympus:
[ticket/10532] Remove unnecessary parentheses around calculations of addition.
[ticket/10532] Remove one unnecessary level of if block nesting.
[ticket/10532] Get rid of inline calculation of $start, remove duplicated check
[ticket/10532] Put $total_match_count assignment onto its own line.
[ticket/10532] Adjust total match count and limit
[ticket/10532] Fix $start out of range for pre-made searches
Conflicts:
phpBB/search.php
* rxu/ticket/10532:
[ticket/10532] Remove unnecessary parentheses around calculations of addition.
[ticket/10532] Remove one unnecessary level of if block nesting.
[ticket/10532] Get rid of inline calculation of $start, remove duplicated check
[ticket/10532] Put $total_match_count assignment onto its own line.
[ticket/10532] Adjust total match count and limit
[ticket/10532] Fix $start out of range for pre-made searches
