* develop-olympus:
[ticket/10057] Fixes for a bunch of small problems.
[ticket/10035] ACP template edit feature allows to read any files on webserver.
[ticket/10057] Handle the case of missing interbase extension better.
[ticket/10057] Fixed wrong usage of sql_error again, in firebird.
[ticket/10057] Fixed usage of sql_error again.
[ticket/10057] Condition file/line display on DEBUG_EXTRA or IN_INSTALL.
[ticket/10057] Fixed wrong usage of sql_error in postgres dbal.
[ticket/10057] Skip ibase_service_attach if firebird connection failed.
[ticket/10057] Check for interbase function existence.
[ticket/10057] Split statements in firebird dbal for readability.
[ticket/10057] Include error collector class file in postgres dbal.
[ticket/10057] Moved error collector class into its own file.
[ticket/10057] Use a class for error collection.
[ticket/10057] More informative error messages in postgres dbal.
[ticket/10057] No negative array indexing.
[ticket/10057] Report postgres db connection errors.
* ticket/igorw/9669:
[ticket/9669] Replace spaces with tabs
[ticket/9669] Switch if/else to make the if positive
[ticket/9669] Make sure normalize_nfc returns string
[ticket/9669] Add isNormalized checks for performance
[ticket/9669] Add native Normalizer support
pg_last_error does not work if no connection was ever established.
Therefore we must keep track of connection errors in postgres
dbal ourselves.
PHPBB3-10057
Calling nonexistent functions with @ destroys the script with
no feedback as to the cause of the error. Check whether
interbase functions exist before calling them.
PHPBB3-10057
This will make it autoloadable in 3.1. This commit breaks 3.0
since no code includes the error collector. Such include code
will be in its own commit since it will need to be reverted in 3.1.
PHPBB3-10057
PHP manual does not say that negative array indices are allowed,
so it's best to assume they are not guaranteed to work the way
one would expect.
PHPBB3-10057
Addresses two issues:
1. When pgsql extension is missing, @pg_connect would silently
abort execution. Check for pg_connect existence before calling it,
same with pg_pconnect.
2. When connection fails, the error reported by php is discarded.
User is shown the failure message without the reason for failure,
making debugging difficult. Collect the error (if any) via a
temporarily installed error handler, and display it if connection
failed.
PHPBB3-10057
Since isNormalized is less expensive than normalize[1] and normalization
will be applied repeatedly in most cases[2], it's more efficient to
check for isNormalized.
[1] http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32718&p=208005#p208005
[2] phpBB 3.0 has a call to utf8_normalize_nfc wrapped around any
multibyte request_var call.
PHPBB3-9669
Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.
PHPBB3-9581
* ticket/9549:
[ticket/9549] Display users in their primary group instead of their first group
[ticket/9549] Change default value of "sort legend by group name" to false.
[ticket/9549] Fix displaying empty groups
[ticket/9549] Fix language strings.
[ticket/9549] Only add group to legend/teampage when the checkbox is checked.
[ticket/9549] New method move() to move a group more than 1 up/down.
[ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
[ticket/9549] Throw an error when the given field-name is invalid.
[ticket/9549] Make the class non static and extend delete_group function.
[ticket/9549] Add template changes for subsilver2.
[ticket/9549] Enhance teampage and legend functionality
[ticket/9549] Add the module and files for the ACP.
[ticket/9549] Update database with the new config values and columns
[ticket/9549] Enhance teampage functionality with a new class, group_positions.
Conflicts:
phpBB/install/database_update.php
* ticket/hanakin/10001:
[ticket/10001] Created the new styles within colours.css to handle the displaying of the forum & topic images
[ticket/10001] Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
* develop-olympus:
[ticket/9874] view_log() performs unneeded count query over all log entries.
[ticket/7834] Topic time didn't update when first post was deleted
[ticket/9997] Fixed an inconsistency in the Moderator Control Panel
[ticket/9872] Removed some useless code that broke delete_posts
