aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [task/coding-guidelines] Class member qualifier guidelinesNils Adermann2010-07-041-0/+20
| | | | | | | | Use private, protected or public instead of var. Use static public instead of public static. Use class constants instead of define(). PHPBB3-9557
* [task/coding-guidelines] Added a section about class names.Nils Adermann2010-07-041-1/+27
| | | | | | | The class naming / autoloading RFC is located on area51: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=33237 PHPBB3-9557
* [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOFNils Adermann2010-07-041-111/+67
| | | | | | | | | | | | - 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
* Merge branch 'ticket/bantu/8212' into developAndreas Fischer2010-06-201-1/+1
|\ | | | | | | | | * ticket/bantu/8212: [ticket/8212] Tiny 'typo in comment' fix
| * [ticket/8212] Tiny 'typo in comment' fixAndreas Fischer2010-05-201-1/+1
| | | | | | | | PHPBB3-8212
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-205-6/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \ | | | | | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| | * | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | | | | | | | | | | | | | | | PHPBB3-9655
| * | | Merge branch 'ticket/bantu/9665' into develop-olympusAndreas Fischer2010-06-202-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9665: [ticket/9665] Allow preview of signature when it is the string "0".
| | * | | [ticket/9665] Allow preview of signature when it is the string "0".Andreas Fischer2010-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| | * | | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| | | |/ / | | |/| | | | | | | | | | | | PHPBB3-9656
| * | | | Merge branch 'ticket/bantu/9653' into develop-olympusAndreas Fischer2010-06-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9653: [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
| | * | | | [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signaturesAndreas Fischer2010-06-201-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9653
| * | | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| | * | | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9643
| * | | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| | * | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-9112
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-173-15/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings [ticket/9606] Optimize unread search option.
| * | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| | * | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-172-15/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| | * | | | [ticket/9606] Optimize unread search option.rxu2010-05-172-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-176-0/+375
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | Merge branch 'ticket/bantu/9626' into develop-olympusAndreas Fischer2010-06-176-0/+375
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | * | | | | [ticket/9626] Adding tests for the URL regular expression.Andreas Fischer2010-05-252-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9626
| | * | | | | [ticket/9626] Add missing class prefix.Andreas Fischer2010-05-254-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9626
| | * | | | | [ticket/9626] A few tests for the email regular expression.Andreas Fischer2010-05-252-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9626
| | * | | | | [ticket/9626] More IPv6 regex tests.Andreas Fischer2010-05-251-4/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9626
| | * | | | | [ticket/9626] Adding tests for the IPv4 regular expression.Andreas Fischer2010-05-252-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9626
| | * | | | | [ticket/9626] Adding tests for regular expressions.Andreas Fischer2010-05-253-0/+127
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding tests for the IPv6 regular expression returned by get_preg_expression() PHPBB3-9626
* | | | | | Merge branch 'task/naderman/drop-subsilver2' into developAndreas Fischer2010-06-17198-9414/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/drop-subsilver2: [task/drop-subsilver2] Removing subsilver2 for Ascraeus development. Conflicts: phpBB/styles/subsilver2/template/ucp_pm_message_footer.html phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
| * | | | | | [task/drop-subsilver2] Removing subsilver2 for Ascraeus development.Nils Adermann2010-05-16198-9410/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The discussion about this has taken place on area51: http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32496 PHPBB3-9607
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-172-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9587] Replace '0px' with '0'. [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | | | | | Merge branch 'ticket/bantu/9587' into develop-olympusAndreas Fischer2010-06-171-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9587: [ticket/9587] Replace '0px' with '0'.
| | * | | | | | [ticket/9587] Replace '0px' with '0'.Andreas Fischer2010-06-171-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead. PHPBB3-9587
| * | | | | | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| | * | | | | | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topic. Compare the topic_type on their real value, to ensure there is no MOD causing problems, because of a new topic-type. PHPBB3-9605
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-173-20/+187
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | | | | | | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| | * | | | | | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-05-241-1/+1
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | topic. Just added a check whether the type is announcement or higher. PHPBB3-9605
| * | | | | | Merge branch 'ticket/nickvergessen/9587' into develop-olympusAndreas Fischer2010-06-171-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9587: [ticket/9587] Prosilver overrides reCaptcha class.
| | * | | | | | [ticket/9587] Prosilver overrides reCaptcha class.Joas Schilling2010-05-241-0/+5
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9587
| * | | | | | Merge branch 'feature/bantu/dbal-tests' into develop-olympusAndreas Fischer2010-06-171-19/+181
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: ""
| | * | | | | | [feature/dbal-tests] Follow the coding guidelines and ...Joas Schilling2010-06-171-50/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved a bug caused by a missing order-by. PHPBB3-9625
| | * | | | | | [feature/dbal-tests] Update dataJoas Schilling2010-06-171-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9625
| | * | | | | | [feature/dbal-tests] Multi insertJoas Schilling2010-06-171-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9625
| | * | | | | | [feature/dbal-tests] Delete dataJoas Schilling2010-06-171-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9625
| | * | | | | | [feature/dbal-tests] Insert dataJoas Schilling2010-06-171-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9625
| | * | | | | | [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""Joas Schilling2010-06-171-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9625