aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change version number to 3.0.8-dev in preparation for development on next ↵Nils Adermann2010-02-011-1/+1
| | | | | | release git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10469 89ea8834-ac86-4346-8a33-228a782c2dd0
* Change version numbers to 3.0.7 and 3.0.8-dev in preparation for development ↵Nils Adermann2010-02-0112-55/+55
| | | | | | on next release git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10468 89ea8834-ac86-4346-8a33-228a782c2dd0
* Adding the phpBB build script. This is the latest version of the script Meik ↵Nils Adermann2010-02-014-0/+3091
| | | | | | has been using for releases of phpBB. I've made a few smaller changes to make its output work on the CLI and for it to work when located inside a working directory. Various notices/warnings etc. have been fixed, too. We probably want to make some more major changes to the script, at the moment it seems a little difficult to follow exactly what it does. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10465 89ea8834-ac86-4346-8a33-228a782c2dd0
* fix_files script must have been broken by svn:eol-style quite a while ago, ↵Nils Adermann2010-01-311-3/+3
| | | | | | now uses tr rather than sed to replace carriage returns git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10464 89ea8834-ac86-4346-8a33-228a782c2dd0
* Hopefully nobody will notice me sneaking this one in:Chris Smith2010-01-312-3/+4
| | | | | | | Fix javascript bug in the smilies ACP. #55725 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10463 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56545 - Speed up topic move operation by adding an index for topic_id ↵Andreas Fischer2010-01-2811-0/+18
| | | | | | on the topics track table. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
* Updated AUTHORS file, hope I didn't get any names wrong ;-)Nils Adermann2010-01-281-24/+26
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10461 89ea8834-ac86-4346-8a33-228a782c2dd0
* Do not store email templates in database. [Bug #54505]Nils Adermann2010-01-264-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To explain what this is about, first a short phpBB code history lesson: ;-) r9823 originally introduced the usage of our template class for emails. The messenger class uses set_custom_template() to initialise the template object which neither disables storedb nor inheritance. These two values are set in $user->theme rather than inside a particular template instance (quite a design failure if I may add). Thus the html page that is displayed to the user also determines these settings for the email templates. This obviously causes problems because both emails and other custom templates can quite simply not be stored in the database because the db table only stores the filename, not the path and requires a template id. r9839 then generally disabled storedb and template inheritance for custom templates to fix Bug #40515. This works for custom templates, but not for emails where lots of template objects are created. In such a situation the last call to set(_custom)_template() would now determine the values of storedb and inheritance in _tpl_load. So any page sending emails would neither load its template from the database nor use template inheritance. The same revision also introduced orig_tpl_* variables in set_template() which on their own are very much pointless, but could allow resetting the storedb and inheritance values if they were used to reset $user->theme just before template execution in _tpl_load. In r10150 these orig_tpl_* variables are correctly used to access information about the template of the page being displayed - contrary to the last template used - from within the bbcode, fixing Bug #51285. However r10150 also introduces a pointless $template_mode parameter for set_custom_template(). $template_mode is really just a boolean flag (value you can be 'template' or an arbitrary other value) that if it set circumvents the unsetting of storedb and template inheritance. The very code that had been added to prevent issues with emails and custom templates. Fixing the problem introduced by r8839 but at the same time reintroducing the much greater problem from the original implementation of email templates. And now an explanation of what I did: Based on this I have now changed the set_custom_template method to always disable storedb. It can now properly use inheritance, you simply tell it the path where the parent template can be found, by default the path is false which will turn inheritance off. To make this work the template class now always overwrites $user->theme storedb and inheritance variabbles with orig_tpl_* just before rendering a template in _tpl_load. This way they are guaranteed to always contain the value they had at the time set_template/set_custom_template were called. This fixes [Bug #54505]. In summary, using global state is simply a horrible idea in object oriented programming. Always Pass values, that an object depends on, as parameters - never through magic global variables. Following this principle will safe you from a lot of headaches. Please test this patch as much as possible to make sure templates still work properly for you, focus on multiple languages, missing language files, and custom templates in systems that make use of the template class outside of phpBB itself. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10460 89ea8834-ac86-4346-8a33-228a782c2dd0
* okay, now the confirm_id is no longer enough to get a new row into the qa tableHenry Sudhof2010-01-261-15/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10459 89ea8834-ac86-4346-8a33-228a782c2dd0
* Add a warning for users of old PHP versions about ending support.Josh Woody2010-01-264-1/+17
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
* erm, that wouldn't workHenry Sudhof2010-01-261-3/+3
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10457 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bugs #55485 and #55545 - styles adjustment to correctly display an order ↵Ruslan Uzdenov2010-01-264-0/+20
| | | | | | | | of rtl/ltr mixed content. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10456 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #54745 - Fix language string for PM-Reports refering to post-data.Joas Schilling2010-01-264-3/+5
| | | | | | Authorised by: jelly_doughnut git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
* tuningHenry Sudhof2010-01-261-0/+38
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10454 89ea8834-ac86-4346-8a33-228a782c2dd0
* debug code, begoneHenry Sudhof2010-01-261-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10453 89ea8834-ac86-4346-8a33-228a782c2dd0
* docHenry Sudhof2010-01-261-0/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10452 89ea8834-ac86-4346-8a33-228a782c2dd0
* tuningHenry Sudhof2010-01-261-5/+5
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10451 89ea8834-ac86-4346-8a33-228a782c2dd0
* ACP usabilityHenry Sudhof2010-01-263-13/+64
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
* Further fixes for r10447 and r10448. Correctly account for custom language ↵Josh Woody2010-01-261-1/+10
| | | | | | directories (caught by naderman) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10449 89ea8834-ac86-4346-8a33-228a782c2dd0
* Remove needless check (revising r10447)Josh Woody2010-01-261-7/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fall back to board default language email template if the file does not ↵Josh Woody2010-01-262-2/+9
| | | | | | exist user's preferred language (#35595) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10447 89ea8834-ac86-4346-8a33-228a782c2dd0
* Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, ↵Nils Adermann2010-01-263-3/+48
| | | | | | when using PostgreSQL <= 7.4 [Bug #54435] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
* Revert r9564, Fix #54445, Related to #44665.Andreas Fischer2010-01-2510-20/+9
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
* Ignore that last commit message in r10443.Cullen Walsh2010-01-251-1/+1
| | | | | | | | | | | | Update user's last visit field correctly when changing activation status (Bug #56185) Regression introduced by r10103 for Bug #44975 Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10444 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Don't send activation email when user tries to change email without ↵Cullen Walsh2010-01-252-5/+9
| | | | | | | | | permission (fix by nrohler). (Bug #56335) Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10443 89ea8834-ac86-4346-8a33-228a782c2dd0
* Deprecate $allow_reply parameter to truncate_string() (Bug #56675)Josh Woody2010-01-252-2/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10442 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.Joas Schilling2010-01-258-9/+10
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10441 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #49945 - [Fix] Correctly hover list menu in UCP and MCP for rtl languages.Joas Schilling2010-01-252-0/+2
| | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10440 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #33745 - [Fix] Correctly orientate quoted text image on RTL languages.Joas Schilling2010-01-252-1/+2
| | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10439 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Don't send activation email when user tries to change email without ↵Cullen Walsh2010-01-252-1/+2
| | | | | | | | | permission (fix by nrohler). (Bug #56335) Authorised by: naderman git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10438 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix: "typo" on r10436Joas Schilling2010-01-241-1/+1
| | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10437 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Fix] Do not automatically unsubscribe users from topics, when email and ↵Joas Schilling2010-01-242-1/+2
| | | | | | | | jabber is disabled. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10436 89ea8834-ac86-4346-8a33-228a782c2dd0
* Let's remove this warning again, since it for example also works quite well ↵Andreas Fischer2010-01-241-3/+0
| | | | | | with the topic_id. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10435 89ea8834-ac86-4346-8a33-228a782c2dd0
* acl_get() of course requires the forum_id there.Andreas Fischer2010-01-241-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10434 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #55045 - Do not duplicate previous/next links in pagination text of ↵Ruslan Uzdenov2010-01-243-2/+3
| | | | | | | | moderator logs and user notes in MCP for subsilver2. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10433 89ea8834-ac86-4346-8a33-228a782c2dd0
* Trigger error right away if user has exceeded login attempts instead of ↵Andreas Fischer2010-01-201-0/+5
| | | | | | asking for the authentication data over and over again without accepting it even if it is correct. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10432 89ea8834-ac86-4346-8a33-228a782c2dd0
* Make sure captcha factory is there. Make sure language array is there.Andreas Fischer2010-01-202-0/+10
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10431 89ea8834-ac86-4346-8a33-228a782c2dd0
* [Feature] Ability to use HTTP authentication in ATOM feeds by passing the ↵Andreas Fischer2010-01-199-0/+123
| | | | | | GET parameter auth=http git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10430 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #56075 - "Bump Topic" link not showing when bump interval is 0Ruslan Uzdenov2010-01-192-1/+2
| | | | | | Authorised by: Jelly_Doughnut git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10429 89ea8834-ac86-4346-8a33-228a782c2dd0
* Bug #56285 - Properly calculate posts in a topic in the MCPCullen Walsh2010-01-192-1/+9
| | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
* - Bug #56255 - Moving topics to a forum where you are on queue Josh Woody2010-01-185-9/+22
| | | | | | - Allow some error handling in compress class by returning false if file does not exist. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
* Fix bug #51585 - Search loginbox or auth message differsRuslan Uzdenov2010-01-182-18/+21
| | | | | | Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10426 89ea8834-ac86-4346-8a33-228a782c2dd0
* Friends and foes will not show up as private message rule options if their ↵Chris Smith2010-01-182-0/+18
| | | | | | respective UCP modules are disabled. #51155 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10425 89ea8834-ac86-4346-8a33-228a782c2dd0
* Minor language change #56745Chris Smith2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10424 89ea8834-ac86-4346-8a33-228a782c2dd0
* Include live data in the statistics #53795Chris Smith2010-01-171-0/+4
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10423 89ea8834-ac86-4346-8a33-228a782c2dd0
* The easy solution to all my problems with SQLite is this. :( #56105Chris Smith2010-01-172-1/+9
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10422 89ea8834-ac86-4346-8a33-228a782c2dd0
* #56455 - remove extra space in templateHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10421 89ea8834-ac86-4346-8a33-228a782c2dd0
* Load reCAPTCHA over https when using a secure connection to the board. #55755Chris Smith2010-01-172-0/+8
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10420 89ea8834-ac86-4346-8a33-228a782c2dd0
* update logHenry Sudhof2010-01-171-0/+2
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10419 89ea8834-ac86-4346-8a33-228a782c2dd0
* spacesHenry Sudhof2010-01-171-1/+1
| | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10418 89ea8834-ac86-4346-8a33-228a782c2dd0