mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
9,857 Commits 17 Branches 190 Tags
Commit Graph

931 Commits

Author SHA1 Message Date
Nils Adermann
560a1b3ad4 Merge branch 'bug/nickvergessen/9047' into develop-olympus 
* bug/nickvergessen/9047:
  [bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)

Conflicts:
	phpBB/docs/CHANGELOG.html
 2010-04-04 15:31:38 +02:00
Nils Adermann
1af1a96501 Merge branch 'feature/nickvergessen/unapproved-posts-in-feed' into develop-olympus 
* feature/nickvergessen/unapproved-posts-in-feed:
  [feature/unapproved-posts-in-feed] Little changelog correction
  [feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
  [feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed

Conflicts:
	phpBB/docs/CHANGELOG.html
 2010-04-04 15:29:45 +02:00
Nils Adermann
feb3987802 Merge branch 'bug/nickvergessen/9512' into develop-olympus 
* bug/nickvergessen/9512:
  [bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)

Conflicts:
	phpBB/docs/CHANGELOG.html
 2010-04-04 15:26:50 +02:00
Nils Adermann
5b5463a981 Merge branch 'bug/nickvergessen/58745' into develop-olympus 
* bug/nickvergessen/58745:
  [bug/58745] Correct changelog message
  [bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)

Conflicts:
	phpBB/docs/CHANGELOG.html
 2010-04-04 15:21:27 +02:00
Nils Adermann
f07c9fab2b Merge branch 'bug/nickvergessen/58695' into develop-olympus 
* bug/nickvergessen/58695:
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)

Conflicts:
	phpBB/docs/CHANGELOG.html
 2010-04-04 15:17:48 +02:00
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
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
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
8d0c0dcbcd [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695) 2010-04-03 12:55:31 +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
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
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
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
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
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
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
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
Igor Wiedler
5cfa354433 [bug/12531] proposed solution for bug #12531 2010-03-06 17:57:27 +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
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
Cullen Walsh
b853845069 Oops, forgot the changelog for #57105 2010-03-02 13:01:05 -08:00
Chris Smith
2f6c8a0164 Missed one half of bug #54855 whoops 2010-03-02 19:30:37 +00:00
Andreas Fischer
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
Andreas Fischer
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
Josh Woody
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
Nils Adermann
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
Nils Adermann
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
Andreas Fischer
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
Chris Smith
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
Henry Sudhof
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
Nils Adermann
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
Chris Smith
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
Josh Woody
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
Andreas Fischer
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
Andreas Fischer
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
Joas Schilling
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
Andreas Fischer
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