aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-132-4/+4
| | | | PHPBB3-9519
* [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-132-4/+4
| | | | | | includes/functions_convert.php and install/install_convert.php tested by Dicky. PHPBB3-9519
* [ticket/9519] Replace remaining is_writable() calls with phpbb_is_writable().Joas Schilling2010-08-1010-17/+17
| | | | | | | acm_memory.php is untested. install/install_convert.php and includes/functions_convert.php are going to be tested and committed afterwards. PHPBB3-9519
* Merge branch 'ticket/ckwalsh/9715' into develop-olympusAndreas Fischer2010-07-122-1/+44
|\ | | | | | | | | | | * ticket/ckwalsh/9715: [ticket/9715] Better email regex [ticket/9715] Extend email unit tests
| * [ticket/9715] Better email regexCullen Walsh2010-07-111-1/+3
| | | | | | | | | | | | | | Using email regex created by James Watts and Francisco Jose Martin Moreno. This passes many more tests for RFC valid emails. PHPBB3-9715
| * [ticket/9715] Extend email unit testsCullen Walsh2010-07-111-1/+42
| | | | | | | | | | | | Adding more email tests for a wider range of valid email formats. PHPBB3-9715
* | Merge branch 'ticket/bantu/9714' into develop-olympusAndreas Fischer2010-07-121-1/+1
|\ \ | | | | | | | | | | | | * ticket/bantu/9714: [ticket/9714] Use correct variable name in email regular expression tests.
| * | [ticket/9714] Use correct variable name in email regular expression tests.Andreas Fischer2010-07-081-1/+1
| | | | | | | | | | | | PHPBB3-9714
* | | Merge branch 'ticket/naderman/9701' into develop-olympusAndreas Fischer2010-07-121-3/+21
|\ \ \ | | | | | | | | | | | | | | | | * ticket/naderman/9701: [ticket/9701] Prevent notices from being hidden by template tests
| * | | [ticket/9701] Prevent notices from being hidden by template testsNils Adermann2010-07-081-3/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The template tests disable NOTICEs for the duration of template execution since the current version of the template engine does not generate sufficiently clean code. The error level is reset aftwards, however that part is skipped when trigger_error is called which is converted into a regular exception by PHPUnit and passed down until caught. Such exceptions are now caught to reset the error level, and then the exception is rethrown. This uncovered another issue in the template tests which only passed because NOTICEs were unintentionally disabled at this point. assign_display is also required to operate without NOTICEs. The respective code has been added around its callee as well. However no handling of exceptions takes place there. If another test checking for errors in that function is ever added similar catch logic will have to be added there. PHPBB3-9701
* | | Merge branch 'ticket/naderman/9140' into develop-olympusAndreas Fischer2010-07-121-0/+11
|\ \ \ | | | | | | | | | | | | | | | | * ticket/naderman/9140: [ticket/9140] Check current board version in incremental update packages
| * | | [ticket/9140] Check current board version in incremental update packagesGabriel Vazquez2010-07-121-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we do not want to limit the updater functionality we only display a prominent warning when the current board version does not match the version the update files are meant to update from. PHPBB3-9140
* | | | Merge branch 'ticket/nickvergessen/9531' into develop-olympusAndreas Fischer2010-07-126-4/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9531: [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
| * | | | [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"Joas Schilling2010-07-116-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables. PHPBB3-9531
* | | | | Merge branch 'ticket/adamreyher/9012' into develop-olympusAndreas Fischer2010-07-111-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * ticket/adamreyher/9012: [ticket/9012] Adjust shadow topic title to the title at the time it was moved.
| * | | | [ticket/9012] Adjust shadow topic title to the title at the time it was moved.Adam Reyher2010-07-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved topics which have their title changed in the new forum will now show the old title in the original viewforum instead of the new title. PHPBB3-9012
* | | | | Merge branch 'ticket/jellydoughnut/9637' into develop-olympusAndreas Fischer2010-07-1110-25/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9637: [ticket/9637] Do not cache SQL server version in all cases
| * | | | | [ticket/9637] Do not cache SQL server version in all casesJosh Woody2010-07-1110-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the existing cache is global, there is no way to differentiate between each of two databases which may be two different DBAL objects pointing to servers with wildly different versions of an RDBMS. phpBB only has this situation in the UCF, thus only one file changed outside the DBAL. I have added a second optional parameter, $use_cache to each of the implementations of dbal::sql_server_info() PHPBB3-9637
* | | | | | Merge branch 'ticket/jellydoughnut/9629' into develop-olympusAndreas Fischer2010-07-112-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9629: [ticket/9629] Allow style.php to retrieve its session ID from cookies
| * | | | | | [ticket/9629] Allow style.php to retrieve its session ID from cookiesJosh Woody2010-07-112-8/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | style.php takes a session ID to ensure it gets the right language for a user, but that session ID is always passed in GET. This allows change allows the SID to be read from the cookie, and theoretically makes it friendlier for caching engines like Varnish. PHPBB3-9629
* | | | | | Merge branch 'ticket/nickvergessen/9678' into develop-olympusAndreas Fischer2010-07-101-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9678: [ticket/9678] Flash attachments are not displayed in subsilver2.
| * | | | | | [ticket/9678] Flash attachments are not displayed in subsilver2.Joas Schilling2010-07-081-2/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | PHPBB3-9678
* | | | | | Merge branch 'ticket/nickvergessen/9677' into develop-olympusAndreas Fischer2010-07-101-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9677: [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.
| * | | | | | [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments.Joas Schilling2010-07-081-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9677
* | | | | | Merge branch 'ticket/jellydoughnut/9650' into develop-olympusAndreas Fischer2010-07-103-3/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9650: [ticket/9650] Do not allow banning the anonymous user by username
| * | | | | [ticket/9650] Do not allow banning the anonymous user by usernameJosh Woody2010-07-083-3/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Banning anonymous can result in bad things, like not being able to log in. However, it was possible until now. PHPBB3-9650
* | | | | Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-082-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * | | | | [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-062-2/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-9570
* | | | | Merge branch 'ticket/p/9589' into develop-olympusAndreas Fischer2010-07-081-0/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9589: [ticket/9589] Added sample nginx configuration file for phpbb.
| * | | | | [ticket/9589] Added sample nginx configuration file for phpbb.Oleg Pudeyev2010-06-101-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9589
* | | | | | Merge branch 'ticket/p/9593' into develop-olympusAndreas Fischer2010-07-081-0/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/p/9593: [ticket/9593] A readme file for unit tests and running unit tests.
| * | | | | | [ticket/9593] A readme file for unit tests and running unit tests.Oleg Pudeyev2010-07-071-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a readme file explaining prerequisites for unit tests, and how to run unit tests. PHPBB3-9593
* | | | | | | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | | | | | | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | | | | | | Merge branch 'ticket/jellydoughnut/9690' into develop-olympusAndreas Fischer2010-07-082-0/+53
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9690: [ticket/9690] Add forthcoming Bing Bot to list of recognized bots
| * | | | | | | | [ticket/9690] Add forthcoming Bing Bot to list of recognized botsJosh Woody2010-07-072-0/+53
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft will rename MSN Bot to Bing Bot later this year, and change its user agent. This updates phpBB to be aware of Bing Bot PHPBB3-9690
* | | | | | | | Merge branch 'ticket/evil3/9704' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/evil3/9704: [ticket/9704] Fix minor typo in coding guidelines.
| * | | | | | | | [ticket/9704] Fix minor typo in coding guidelines.Igor Wiedler2010-07-081-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9704
* | | | | | | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-082-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | | | | | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-282-1/+14
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | PHPBB3-9578
* | | | | | | | Merge branch 'ticket/nickvergessen/9628' into develop-olympusAndreas Fischer2010-07-081-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9628: [ticket/9628] _add_module 'after'-parameter does not work correctly.
| * | | | | | | | [ticket/9628] _add_module 'after'-parameter does not work correctly.Joas Schilling2010-05-281-1/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modules were grouped by left_id so num_modules is always one (hopefully), but the number of rows is the actual value we'd like to know. Removing the GROUP BY resolves the issue. PHPBB3-9628
* | | | | | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-082-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | | | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-012-5/+5
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | | | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| * | | | | | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9697
* | | | | | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9703: [ticket/9703] Correct database leak where deleting user did not rm some PM data
| * | | | | | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users' PM rules and PM folders were being left intact when deleting them. PHPBB3-9703
* | | | | | | | Merge branch 'ticket/cs278/9712' into develop-olympusAndreas Fischer2010-07-081-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | * ticket/cs278/9712: [ticket/9712] Future dates can be formatted as 'less than one minute ago'
| * | | | | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-9712