1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

9357 Commits

Author SHA1 Message Date
Joas Schilling
147d6fd590 [feature/dbal-tests] Make some tests for return_on_error on SELECT-queries 2010-03-26 23:27:49 +01:00
Joas Schilling
c6442ce640 [feature/dbal-tests] Tests for $db->sql_query_limit() 2010-03-26 21:02:56 +01:00
Joas Schilling
a7581085e0 [feature/dbal-tests] Load phpbb-schema after creating the connection to the database 2010-03-26 17:37:01 +01:00
Joas Schilling
af654814f6 [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield. 2010-03-26 16:41:19 +01:00
Joas Schilling
94bc65e203 [feature/dbal-tests] Added database test & refactored test framework
There is now a phpbb_database_test_case which can be used as a base class for tests that require database access. You have to set up a test_config.php file in your tests/ directory containing host, user, pass etc.

Extra test functionality has been moved to phpbb_test_case_helpers to provide the same functionality in database tests and regular tests without duplicating the code. This is achieved through delegation of method calls.
2010-03-26 16:39:37 +01:00
Joas Schilling
c71b1245ec [develop-olympus] Make this test run on windows with backslash-paths. 2010-03-26 14:46:18 +01:00
Nils Adermann
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
Nils Adermann
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
Chris Smith
b64686073a [bug/58685] Correct spelling errors in append_sid() comments. 2010-03-18 21:07:19 +00:00
Nils Adermann
5193160546 Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympus
* feature/arstechnica/memcache-multi-server:
  [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
2010-03-18 17:09:52 +01:00
Nils Adermann
f7c41e1db7 [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog. 2010-03-18 17:09:18 +01:00
Nils Adermann
da5c36fdeb Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympus
* feature/arstechnica/memcache-multi-server:
  [feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes.
  [feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
2010-03-18 17:04:14 +01:00
mrkurt
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
mrkurt
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
Nils Adermann
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
Josh Woody
144effd74c Allow setting parent forums regardless of permission settings. (Bug #58415) 2010-03-17 10:04:07 -05: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
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 release-3.0.7-PL1 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