Joas Schilling
39f26c5cfd
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047 )
2010-04-04 12:23:07 +02:00
Joas Schilling
5f044a015e
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512 )
2010-04-04 02:03:23 +02:00
Joas Schilling
19c7ea3c16
[feature/unapproved-posts-in-feed] Little changelog correction
2010-04-04 01:49:56 +02:00
Joas Schilling
9b596faa39
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
2010-04-04 01:35:55 +02:00
Joas Schilling
46f85329da
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
2010-04-04 01:34:47 +02:00
Igor Wiedler
11de6a46b1
[git-tools] add note about PHP_BIN using env
2010-04-03 22:06:25 +02:00
Igor Wiedler
8091e31666
[git-tools] do not display stderr
2010-04-03 21:53:09 +02:00
Joas Schilling
738914ac83
[bug/58745] Correct changelog message
2010-04-03 13:11:23 +02:00
Joas Schilling
492d86000e
[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745 )
2010-04-03 13:05:44 +02:00
Joas Schilling
0d4daeb615
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
2010-04-03 12:56:52 +02:00
Joas Schilling
8d0c0dcbcd
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695 )
2010-04-03 12:55:31 +02:00
Igor Wiedler
e3ebdbd79b
Merge branch 'develop-olympus' into git-tools
2010-04-03 10:47:07 +02:00
Chris Smith
3e5236dcd6
[git-tools] Prepend the branch to the commit message for all branches.
2010-04-03 02:13:48 +01:00
Chris Smith
b6920b7ca8
[git-tools] Use env to find the correct paths to binaries.
2010-04-03 02:12:21 +01:00
Chris Smith
5568b2134b
[git-tools] Display what parse errors were found.
2010-04-03 01:53:12 +01:00
Chris Smith
a06ec8c7fd
[git-tools] This script requires bash to run, so point directly to bash.
2010-04-03 01:51:37 +01:00
Nils Adermann
43774ef423
Merge branch 'feature/dbal-tests' into develop-olympus
...
* feature/dbal-tests:
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
2010-04-02 18:29:08 +02:00
Andreas Fischer
4a2a84d7a2
[feature/dbal-tests] Remove hardcoded 'mysql' from PDO DSN in DBAL test.
2010-04-02 18:28:40 +02:00
Andreas Fischer
e9de68f9a3
[feature/dbal-tests] Fix mysql (not mysqli) dbal test.
...
Correctly determine MySQL version from the database.
2010-04-02 18:28:06 +02:00
Nils Adermann
a2545d1203
Merge branch 'bug/bantu/9108' into develop-olympus
...
* bug/bantu/9108:
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-04-01 21:27:19 +02:00
Nils Adermann
6d9d2b6be6
Merge branch 'feature/dbal-tests' into develop-olympus
...
* feature/dbal-tests:
[feature/dbal-tests] Only output the missing config error message once.
[feature/dbal-tests] Make the PDO prefix depend on the dbms.
[feature/dbal-tests] Fix whitespace and line endings.
[feature/dbal-tests] Make some tests for build_array_data on SELECT
[feature/dbal-tests] Make some tests for return_on_error on SELECT-queries
[feature/dbal-tests] Tests for $db->sql_query_limit()
[feature/dbal-tests] Load phpbb-schema after creating the connection to the database
[feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.
[feature/dbal-tests] Added database test & refactored test framework
2010-04-01 19:16:45 +02:00
Nils Adermann
2bbfa9c29f
[feature/dbal-tests] Only output the missing config error message once.
...
The error message was also not properly escaping the variables, thus
producing an incorrect example configuration file.
2010-04-01 19:15:34 +02:00
Nils Adermann
53ab8886b1
[feature/dbal-tests] Make the PDO prefix depend on the dbms.
...
The database base test will need a few more changes to run on all the
databases we support. But those really need to be made on a system where
they run and can be tested. Patches welcome!
2010-04-01 19:08:11 +02:00
Nils Adermann
23beaceadd
[feature/dbal-tests] Fix whitespace and line endings.
2010-04-01 18:59:26 +02:00
Nils Adermann
f97d0e0195
Merge branch 'bug/nickvergessen/59135' into develop-olympus
...
* bug/nickvergessen/59135:
[bug/59135] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135 )
Conflicts:
phpBB/docs/CHANGELOG.html
2010-04-01 18:55:16 +02:00
Andreas Fischer
2b696cc632
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425 )
...
The order in the FROM clause is important.
The posts table has to be the last one in the chain, so it can be correctly bound with the forums table in the LEFT JOIN.
This only affects the overall feed (board-wide feed). All the other feeds are unaffected.
2010-04-01 13:14:58 +02:00
Nils Adermann
e35392cb4f
Merge branch 'bug/kellanved/59425' into develop-olympus
...
* bug/kellanved/59425:
[bug/59425] Correctly check for double inclusion in captcha garbage collection
2010-03-28 15:09:09 +02:00
Nils Adermann
b111e4d927
Merge branch 'bug/kellanved/58465' into develop-olympus
...
* bug/kellanved/58465:
[bug/58465] The redirect hidden field is now XHTML conform
2010-03-28 15:09:05 +02:00
U-H-PC\H
9be61f9e53
[bug/59425] Correctly check for double inclusion in captcha garbage collection
...
The check to avoid the double inclusion of the captcha factory class in the
garbage collection code was faulty, checking for "captcha_factory" instead of "phpbb_captcha_factory".
TerryE pointed the problem out, thanks!
2010-03-28 14:37:31 +02:00
U-H-PC\H
6cfb4c82dd
[bug/58465] The redirect hidden field is now XHTML conform
...
The result of build_url was falsely un-entitized.
2010-03-28 14:17:42 +02:00
Igor Wiedler
472739bcbc
Merge branch 'develop-olympus' into git-tools
2010-03-28 14:12:36 +02:00
Joas Schilling
53d316dc9e
[feature/dbal-tests] Make some tests for build_array_data on SELECT
2010-03-27 10:42:09 +01:00
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
Nils Adermann
d702dba75e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[develop-olympus] Make this test run on windows with backslash-paths.
[bug/56965] Redirect fails with directory traversal
[bug/58685] Correct spelling errors in append_sid() comments.
[bug/58025] Search robots are now redirected if they send a SID in the request
2010-03-26 18:28:48 +01:00
Nils Adermann
d79cff235c
Merge remote branch 'github-nickvergessen/develop-olympus' into develop-olympus
...
* github-nickvergessen/develop-olympus:
[develop-olympus] Make this test run on windows with backslash-paths.
2010-03-26 18:27:39 +01:00
Nils Adermann
4515a45e0c
Merge branch 'bug/jellydoughnut/56965' into develop-olympus
...
* bug/jellydoughnut/56965:
[bug/56965] Redirect fails with directory traversal
2010-03-26 18:24:47 +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
Josh Woody
eca2db4afe
[bug/56965] Redirect fails with directory traversal
...
Correct invalid r10536 with a boolean flag. Note that this fix for the bug will not actually correct the redirects, it will only prevent phpBB from redirecting outside $phpbb_root_path when redirect()'s third argument is not provided.
2010-03-22 21:16:11 -05:00
Igor Wiedler
a5057c9f25
Merge branch 'develop-olympus' into git-tools
2010-03-22 22:54:24 +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
Chris Smith
492063cec6
[bug/59465] Remove start=0 from topic pagination links.
...
Patch once again by nn-.
2010-03-18 20:28:59 +00:00
Chris Smith
a3a8fb989c
[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
...
Having start=0 makes search engines index the page twice once with and
once without the start=0 parameter. This results in duplicate results
in the search results. Patch contributed by nn-.
2010-03-18 17:22:30 +00:00
Nils Adermann
2c635b473b
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
2010-03-18 17:10:36 +01: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