b3ff3be0dc
Merge branch 'bug/cs278/58685' into develop-olympus
...
* bug/cs278/58685:
[bug/58685] Correct spelling errors in append_sid() comments.
2010-03-18 22:13:25 +01:00
c6870ac3fe
Merge branch 'bug/cs278/58025' into develop-olympus
...
* bug/cs278/58025:
[bug/58025] Search robots are now redirected if they send a SID in the request
Conflicts:
phpBB/docs/CHANGELOG.html
2010-03-18 22:10:31 +01:00
b64686073a
[bug/58685] Correct spelling errors in append_sid() comments.
2010-03-18 21:07:19 +00:00
c57c1f3fc6
[feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
...
Host and ports are now represented like this in config:
host1/port1,host2/port2,host3/port3
2010-03-18 17:01:50 +01:00
559313eda6
[feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
...
You can define multiple memcache servers in your config using this format:
host::port,host::port,host::port
Example:
@define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
2010-03-18 17:01:21 +01:00
10f81ee79f
Merge branch 'bug/jellydoughnut/58415' into develop-olympus
...
* bug/jellydoughnut/58415:
Allow setting parent forums regardless of permission settings. (Bug #58415 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-03-17 18:05:17 +01:00
144effd74c
Allow setting parent forums regardless of permission settings. (Bug #58415 )
2010-03-17 10:04:07 -05:00
d07e152ea7
[bug/58025] Search robots are now redirected if they send a SID in the request
...
Previously search robots could stumble upon a board link somewhere on the web
containing a SID they'd follow it and end up indexing that page with the SID
in the request URI, this fix prevents that by redirecting them to the same URI
just without the SID.
2010-03-13 02:15:39 +00:00
23141a2c51
Merge branch 'bug/dpward/58755' into develop-olympus
2010-03-07 21:56:48 +01:00
62e0c325b4
Merge branch 'bug/evil3/12531' into develop-olympus
2010-03-07 21:56:07 +01:00
865123ffda
[bug/58755] Fix a redirection bug that can occur after login
...
This issue affects any forum (i.e. https://myforum/phpBB3/ ) where:
- the forum is located in a directory underneath the web root (i.e., NOT https://myforum/ )
- a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php )
- the URI used ends in a slash (i.e., NOT https://myforum/phpBB3 )
If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid= ).
This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid= )
2010-03-07 13:56:24 -05:00
5cfa354433
[bug/12531] proposed solution for bug #12531
2010-03-06 17:57:27 +01:00
568fb83373
Merge branch 'master' into develop-olympus
2010-03-06 02:29:04 +01:00
9d005973b0
[bug/51555] proposed fix for bug #51555
2010-03-06 01:39:44 +01:00
39490abfff
Incrementing the version number to 3.0.7-PL1
2010-03-05 21:09:37 +01:00
93a2407f65
Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.
...
Moved the MIN(smiley_order) to the SELECT column list now, so it can be
used for sorting on MySQL 4, but also still works on MSSQL, which the
bug was originally about.
2010-03-02 21:12:35 +01:00
872ad322ec
Increment version number to 3.0.7
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 19:30:58 +00:00
cb2d1bd4fc
Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations without utf8 support, it only matches ascii characters & numbers there. [Bug #58055 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10552 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-28 00:00:39 +00:00
5bd9d461e0
Make the new {INTTEXT} work on pcre installations without utf8 support, it only matches ascii characters & numbers there. [Bug #58055 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10551 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 23:57:13 +00:00
1d098379d9
#58055 again
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 11:10:34 +00:00
c115ad2b8f
#58055 again
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10546 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-27 11:09:23 +00:00
df3ac64083
okay, minus should work now #58055
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-26 20:43:54 +00:00
204b5f579e
okay, minus should work now #58055
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10544 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-26 20:32:00 +00:00
9e389e8a5b
possible cause of #58055
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-26 08:36:53 +00:00
f03e986f81
possible cause of #58055
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10542 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-26 08:35:41 +00:00
df24e4feaf
only whitespaces, not newlines
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10541 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 21:50:00 +00:00
c2f2bff2ae
only whitespaces, not newlines
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10540 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 21:48:21 +00:00
9e64c3bd84
Bug #56965 - Allow redirect() to redirect across directories.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10536 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 00:18:30 +00:00
3a48b03547
Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:46:43 +00:00
d3459b3f49
Merge r10526 into 3.0.7 branch.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 19:07:25 +00:00
2ec1d92388
Fix Bug #57375 - Do not delete unrelated attachments when deleting empty forums.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10526 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 18:52:06 +00:00
63e07777cd
Merge r10515 into 3.0.7 branch
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 16:12:51 +00:00
87bc1c6760
sneak attack merge r10518
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 00:59:27 +00:00
e01171ca85
General errors can't be logged if there isn't a database connection, introduced in r9924 #57975
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10518 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 00:57:01 +00:00
9aa4a822ef
Enter stage left: the INTTEXT token (merge)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 11:35:45 +00:00
22621e0439
Enter stage left: the INTTEXT token
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 11:33:29 +00:00
6b99b85c8f
BBCode parser now uses the user object for all settings rather than taking some from the template object [Bug #57365 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 01:31:10 +00:00
d7f4922993
merging TEXT warn from 3_0_0
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10512 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 16:44:00 +00:00
14e21a1a38
warn users about TEXT
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10511 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 16:18:28 +00:00
5ae48dd873
Bump version to 3.0.7-RC2.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 02:14:02 +00:00
dccd529498
Merge r10497 and r10499 into 3.0.7 - #57755
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:40:51 +00:00
30b83896a1
Fix Bug #57755 - Make user_email_hash() function independent from system's architecture.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10499 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:17:30 +00:00
0ddc370386
Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.
...
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 18:40:22 +00:00
c0e9bc5126
Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.
...
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10496 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 12:49:05 +00:00
a0531a990b
r10491 - Also in the Post Settings section. Thanks leviatan21
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10492 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-16 10:42:24 +00:00
c6e176d88e
Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10491 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-15 15:04:44 +00:00
7332b3b741
Forgot to properly update the file header of mssqlnative.php, revising r10489 [Bug #57055 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10490 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-11 00:05:32 +00:00
1802b9ff92
Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055 ]
...
If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you
want to try it on a current phpBB version you can apply the latest version of the patch to your board which
you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the
ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-11 00:02:51 +00:00
8682f644e5
Merge r10484 and r10485 into 3.0.7 branch.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-08 16:54:39 +00:00
037aea067b
Fix Bug #57455 - Fix problems with firebird by no longer using 'count' as a column alias.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10484 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-08 16:43:39 +00:00
