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
f7c41e1db7
[feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
2010-03-18 17:09:18 +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
c52a7e9a08
Adding the bugfix for #58755 to the changelog.
2010-03-07 21:54:56 +01: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
5d1d32a65b
Merge branch 'bug/evil3/51555' into develop-olympus
2010-03-06 02:13:31 +01:00
9d005973b0
[bug/51555] proposed fix for bug #51555
2010-03-06 01:39:44 +01:00
0307d1f4aa
Oops, forgot the changelog for #57105
2010-03-06 01:36:23 +01:00
39490abfff
Incrementing the version number to 3.0.7-PL1
2010-03-05 21:09:37 +01:00
c8fd9f4266
Mark the bugfix #58595 as a security fix
2010-03-05 21:00:13 +01:00
b1ab74b043
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 20:59:20 +01:00
f0a82396d4
Mark the bugfix #58595 as a security fix
2010-03-05 20:56:06 +01:00
7f991e8480
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 18:51:30 +01:00
b853845069
Oops, forgot the changelog for #57105
2010-03-02 13:01:05 -08:00
72e2af08e1
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
2010-03-02 20:46:19 +01:00
24fda6671d
Merging master after 3.0.7 release into develop-olympus to make sure there are no inconsistencies.
2010-03-02 20:33:50 +01:00
2f6c8a0164
Missed one half of bug #54855 whoops
2010-03-02 19:30:37 +00:00
cdc96b0c7d
Bug #58085 - Add terminating semicolons to JavaScript code found by JSLint. Patch by nn-
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10539 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:51:35 +00:00
27fa1a69e8
Merge r10537 into 3.0.7. branch
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10538 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:42:25 +00:00
e57981d1f5
Fix Bug #57875 - We have to add the paragraph tags there. Patch by HardStyle, Regression from r10096.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10537 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-25 10:33:06 +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
82219d51c2
Merge r10528 into 3.0.7: Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075 ]
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-24 00:08:13 +00:00
8f5155d272
Quick reply enable button was merged into 3.0.7: r10491, r10492 and r10529
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10530 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:49:15 +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
47ce0f2a93
Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075 ]
...
If you were trying to update from 3.0.5 to 3.0.6 but were presented with a dialogue
suggesting to merge the same file over and over take the install/install_update.php
from 3.0.7-RC2 or current svn, and replace your 3.0.5 one with it. It works fine in
3.0.5.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10528 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:35:48 +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
a63ceb28e2
merge in r10509
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 00:15:35 +00:00
14b5aab07f
Firebird based board can now access their global announcements, took a while to discover this one. #57525
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10509 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 00:02:56 +00:00
d49806a043
#57715 - Correct behavior of "force_approved_state" when value is false.
...
(Merging r10507 into branches/phpBB-3_0_0)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10508 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 04:57:23 +00:00
fff87d544d
#57715 - Correct behavior of "force_approved_state" when value is false.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 04:56:06 +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
b68d23347a
Merge r10488 into 3.0.7 branch. #57505
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:31:06 +00:00
9bcb25cd10
We can put the fix for #57505 into 3.0.7 because we have to regenerate the packages with the template changes anyway.
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10500 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:23:31 +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
6a9e5ea78f
Merge r10493, r10494 - #57825
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10495 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 10:03:29 +00:00
e1ae09a787
Let's fix #57825 in 3.0.7. - r10493
...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10494 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 09:59:04 +00:00
