Joas Schilling
4349bec316
[bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135 )
...
introduced in r10496 and r10360/r10361
2010-03-13 11:37:06 +01:00
Chris Smith
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
Igor Wiedler
f9192bed79
[git-tools] Some pre-commit enhancements, abolish tempfile
2010-03-11 19:44:21 +01:00
Igor Wiedler
6df10358aa
[git-tools] use mktemp in pre-commit (thanks nn-)
2010-03-10 21:37:55 +01:00
Igor Wiedler
3dd9040cc1
Merge branch 'develop-olympus' into git-tools
2010-03-10 20:12:10 +01:00
Igor Wiedler
db8c557e4c
[git-tools] pre-commit hook for syntax checking
...
This pre-commit hook utilises PHP's command-line -l (lint) option, which
checks for syntax errors. In case of an error the commit is rejected and
the error displayed.
Testing is welcome.
2010-03-10 20:07:10 +01:00
Nils Adermann
60bd1edcb5
[develop-olympus] Backported 3.1 unit tests to 3.0.
...
Start adding unit tests for bugs you fix! Tests for anything are
welcome really. We have to work on these a lot.
2010-03-10 16:24:19 +01:00
Nils Adermann
d9567f121b
Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-olympus
2010-03-08 01:07:27 +01:00
Igor Wiedler
0a6db697e6
Add feature/ support to branchname hook
...
The previously introduced branchname hook now will also use feature/
branch names, in addition to the existing bug/.
2010-03-08 01:04:33 +01:00
Nils Adermann
9f8d258de4
Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into develop-olympus
2010-03-08 00:50:48 +01:00
Igor Wiedler
d0d1ab5471
Adding a branchname prepare-commit-msg hook
...
Git supports several hooks, some of which are client-side. The
prepare-commit-msg hook is run right after a `git commit` call, before
the editor is opened. This allows the initial message to be altered.
This hook will check if the current branch name begins with `bug/`, in
which case it will prepend `[$branchname]` to the commit message. This
makes it easier to create proper commit messages.
http://wiki.phpbb.com/Git#Commit_Messages
For more information refer to the hook source.
2010-03-08 00:41:42 +01:00
Nils Adermann
23141a2c51
Merge branch 'bug/dpward/58755' into develop-olympus
2010-03-07 21:56:48 +01:00
Nils Adermann
62e0c325b4
Merge branch 'bug/evil3/12531' into develop-olympus
2010-03-07 21:56:07 +01:00
Nils Adermann
c52a7e9a08
Adding the bugfix for #58755 to the changelog.
2010-03-07 21:54:56 +01:00
David Ward
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
Igor Wiedler
5cfa354433
[bug/12531] proposed solution for bug #12531
2010-03-06 17:57:27 +01:00
Nils Adermann
568fb83373
Merge branch 'master' into develop-olympus
2010-03-06 02:29:04 +01:00
Nils Adermann
5d1d32a65b
Merge branch 'bug/evil3/51555' into develop-olympus
2010-03-06 02:13:31 +01:00
Igor Wiedler
9d005973b0
[bug/51555] proposed fix for bug #51555
2010-03-06 01:39:44 +01:00
Cullen Walsh
0307d1f4aa
Oops, forgot the changelog for #57105
2010-03-06 01:36:23 +01:00
Nils Adermann
c4e02a1916
Merge commit 'release-3.0.7-PL1'
2010-03-06 01:20:12 +01:00
Nils Adermann
2e1cd98a5a
exclude the image file with text in the name from having newlines fixed
2010-03-05 22:22:39 +01:00
Nils Adermann
39490abfff
Incrementing the version number to 3.0.7-PL1
2010-03-05 21:09:37 +01:00
Nils Adermann
c8fd9f4266
Mark the bugfix #58595 as a security fix
2010-03-05 21:00:13 +01:00
Andreas Fischer
b1ab74b043
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 20:59:20 +01:00
Nils Adermann
07fd270530
Merge branch 'bug/bantu/58595' into develop-olympus
2010-03-05 20:56:45 +01:00
Nils Adermann
f0a82396d4
Mark the bugfix #58595 as a security fix
2010-03-05 20:56:06 +01:00
Andreas Fischer
7f991e8480
Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.
2010-03-05 18:51:30 +01:00
Nils Adermann
ac32927566
Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105
2010-03-02 22:27:45 +01:00
Cullen Walsh
b853845069
Oops, forgot the changelog for #57105
2010-03-02 13:01:05 -08:00
Nils Adermann
be78817d27
Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105
2010-03-02 21:41:24 +01:00
Cullen Walsh
965ab55394
Parse urls in signature taking into account the allow_sig_links config option introduced in phpBB 3.0.6, per bug #57105
2010-03-02 12:22:11 -08:00
Nils Adermann
f493509eb2
Merge branch 'bug/aptx/54945' into develop-olympus
2010-03-02 21:15:13 +01:00
Marek A. Ruszczyński
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
Chris Smith
5003595ed6
Missed one half of bug #54855 whoops
2010-03-02 21:07:07 +01:00
Nils Adermann
72e2af08e1
Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855
2010-03-02 20:46:19 +01:00
Nils Adermann
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
Chris Smith
2f6c8a0164
Missed one half of bug #54855 whoops
2010-03-02 19:30:37 +00:00
Nils Adermann
ca8cc03763
Merge commit 'release-3.0.7'
2010-03-02 01:09:13 +01:00
Nils Adermann
35a62ed008
Merge commit 'release-3.0.7-RC2'
2010-03-02 01:09:11 +01:00
Nils Adermann
3b46681652
Merge commit 'release-3.0.7-RC1'
2010-03-02 01:09:02 +01:00
Nils Adermann
6606e4bffe
Merge commit 'release-3.0.6'
2010-03-02 01:05:41 +01:00
Nils Adermann
723e38ece2
Merge commit 'release-3.0.6-RC4'
2010-03-02 01:05:41 +01:00
Nils Adermann
6ebc26e330
Merge commit 'release-3.0.6-RC3'
2010-03-02 01:05:41 +01:00
Nils Adermann
f0eb18fffd
Merge commit 'release-3.0.6-RC2'
2010-03-02 01:05:40 +01:00
Nils Adermann
021c186be9
Merge commit 'release-3.0.6-RC1'
2010-03-02 01:05:40 +01:00
Nils Adermann
4f9c3b8f5c
Merge commit 'release-3.0.5'
2010-03-02 01:05:40 +01:00
Nils Adermann
a45bca7c49
Merge commit 'release-3.0.5-RC1'
2010-03-02 01:05:39 +01:00
Nils Adermann
1f3498c0d6
Merge commit 'release-3.0.4'
2010-03-02 01:05:39 +01:00
Nils Adermann
a0b5877217
Merge commit 'release-3.0.4-RC1'
2010-03-02 01:05:39 +01:00
