* task/coding-guidelines:
[task/coding-guidelines] Class member qualifier guidelines
[task/coding-guidelines] Added a section about class names.
[task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOF
- Class names need to be prefixed with phpbb_
- eval should not be used in any form
- there should be newlines at the end of file
- the closing php tag should be ommited
- array elements should always have a trailing comma
- the phpBB VCS is now git
- removed the coding guidelines changelog
PHPBB3-9557
* develop-olympus:
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
[ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
[ticket/9665] Allow preview of signature when it is the string "0".
[ticket/9112] Make sure current user can see most active forum/topic.
[ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
[ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
Conflicts:
phpBB/styles/subsilver2/template/ucp_profile_signature.html
phpBB/styles/subsilver2/template/viewtopic_body.html
Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".
PHPBB3-9665
* develop-olympus:
[ticket/9626] Adding tests for the URL regular expression.
[ticket/9626] Add missing class prefix.
[ticket/9626] A few tests for the email regular expression.
[ticket/9626] More IPv6 regex tests.
[ticket/9626] Adding tests for the IPv4 regular expression.
[ticket/9626] Adding tests for regular expressions.
* ticket/bantu/9626:
[ticket/9626] Adding tests for the URL regular expression.
[ticket/9626] Add missing class prefix.
[ticket/9626] A few tests for the email regular expression.
[ticket/9626] More IPv6 regex tests.
[ticket/9626] Adding tests for the IPv4 regular expression.
[ticket/9626] Adding tests for regular expressions.
This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead.
PHPBB3-9587
* develop-olympus:
[feature/dbal-tests] Follow the coding guidelines and ...
[feature/dbal-tests] Update data
[feature/dbal-tests] Multi insert
[feature/dbal-tests] Delete data
[feature/dbal-tests] Insert data
[feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
[ticket/9587] Prosilver overrides reCaptcha class.
[ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
* feature/bantu/dbal-tests:
[feature/dbal-tests] Follow the coding guidelines and ...
[feature/dbal-tests] Update data
[feature/dbal-tests] Multi insert
[feature/dbal-tests] Delete data
[feature/dbal-tests] Insert data
[feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases.
PHPBB3-9132
Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory.
PHPBB3-9633
