* 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.
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
* develop-olympus:
[ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
[ticket/10630] Perform array_unique on authors array before creating the query
* nickvergessen/ticket/10630:
[ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
[ticket/10630] Perform array_unique on authors array before creating the query
* ticket/raimon/10453:
[ticket/10453] PM viewmessage page is misplacing the online icon
[ticket/10453] PM viewmessage page is misplacing the online icon
* develop:
[ticket/10652] Fixing typo in template class
[ticket/10645] Missing CSS for checkboxes
[ticket/10614] Change not installed heading to available.
[ticket/10614] Unbreak all_available on extension manager.
[ticket/10614] Check if cache exists before destroying it
[ticket/10614] Remove ext manager exceptions for now
[ticket/10614] Refactor list command to use manager API
[ticket/10614] Add purge command
[ticket/10614] Tweak list output, show state, purge cache, handle missing exts
[ticket/10614] Make script accessible from anywhere
[ticket/10614] Better usage output
[ticket/10614] Add a script to enable, disable and view status of extensions.
[ticket/10500] Use correct class name in @uses.
[ticket/10500] Fix phpbb_template_compile instantiation.
* develop: (325 commits)
[ticket/10641] Update MCP template with new plurality forms
[ticket/10637] Leftovers from implementation of extensions in convertor
[ticket/10637] Leftovers from implementation of extensions in develop tools
[ticket/10637] Leftovers from implementation of extensions in mcp_post
[ticket/10637] Leftovers from implementation of extensions in mcp_main
[ticket/10637] Leftovers from implementation of extensions
[ticket/10606] Also correctly use $s_search_hidden_fields in view(forum|topic).
[ticket/10606] Fix incorrect hidden fields array name in page_header().
[ticket/10633] Stop leaking filename of attachments when thumbnail is requested
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
[ticket/10634] Specify module type when viewing profile
[ticket/10634] Changing p_master::is_full_class
[ticket/10569] Invalid string comparison in prosilver
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
[ticket/10512] Call startup.php from tests/bootstrap.php
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/9914] Add backup warning to updater.
[ticket/10616] Add template inheritance to exported template
[ticket/10616] Ignore template inheritance that points to self
[ticket/10616] Add template inheritance to default styles
...
