aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into develop-olympusNils Adermann2010-03-061-1/+1
|\
| * Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-051-1/+1
| |
| * Increment version number to 3.0.7Nils Adermann2010-02-281-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10555 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10551 into 3.0.7: Make the new {INTTEXT} work on pcre installations ↵Nils Adermann2010-02-281-9/+20
| | | | | | | | | | | | without utf8 support, it only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10552 89ea8834-ac86-4346-8a33-228a782c2dd0
| * #58055 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10547 89ea8834-ac86-4346-8a33-228a782c2dd0
| * okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10545 89ea8834-ac86-4346-8a33-228a782c2dd0
| * possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10543 89ea8834-ac86-4346-8a33-228a782c2dd0
| * only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10541 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to ↵Nils Adermann2010-02-235-3/+70
| | | | | | | | | | | | enable quick reply in all forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10526 into 3.0.7 branch.Andreas Fischer2010-02-231-6/+7
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10515 into 3.0.7 branchNils Adermann2010-02-231-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
| * sneak attack merge r10518Chris Smith2010-02-221-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Enter stage left: the INTTEXT token (merge)Henry Sudhof2010-02-212-2/+8
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
| * merging TEXT warn from 3_0_0Henry Sudhof2010-02-201-91/+107
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10512 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Bump version to 3.0.7-RC2.Andreas Fischer2010-02-181-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10497 and r10499 into 3.0.7 - #57755Andreas Fischer2010-02-182-3/+5
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to ↵Joas Schilling2010-02-171-0/+5
| | | | | | | | | | | | | | | | folders. Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10484 and r10485 into 3.0.7 branch.Andreas Fischer2010-02-083-5/+6
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Fix #57395, a regression from r10427Josh Woody2010-02-071-1/+1
| | | | | | | | | | | | (merging r10482 into branch_3_0_7) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Merge r10473 into the 3.0.7 branch.Josh Woody2010-02-041-2/+16
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
| * Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA releaseNils Adermann2010-02-011-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
* | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-061-1/+1
| |
* | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.Marek A. Ruszczyński2010-03-021-2/+2
| | | | | | | | | | | | 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.
* | Make the new {INTTEXT} work on pcre installations without utf8 support, it ↵Nils Adermann2010-02-271-9/+20
| | | | | | | | | | | | only matches ascii characters & numbers there. [Bug #58055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10551 89ea8834-ac86-4346-8a33-228a782c2dd0
* | #58055 againHenry Sudhof2010-02-271-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10546 89ea8834-ac86-4346-8a33-228a782c2dd0
* | okay, minus should work now #58055Henry Sudhof2010-02-261-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10544 89ea8834-ac86-4346-8a33-228a782c2dd0
* | possible cause of #58055Henry Sudhof2010-02-261-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10542 89ea8834-ac86-4346-8a33-228a782c2dd0
* | only whitespaces, not newlinesHenry Sudhof2010-02-251-2/+2
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10540 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #56965 - Allow redirect() to redirect across directories.Josh Woody2010-02-251-0/+13
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10536 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57375 - Do not delete unrelated attachments when deleting empty forums.Andreas Fischer2010-02-231-6/+7
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10526 89ea8834-ac86-4346-8a33-228a782c2dd0
* | General errors can't be logged if there isn't a database connection, ↵Chris Smith2010-02-221-1/+1
| | | | | | | | | | | | introduced in r9924 #57975 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10518 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Enter stage left: the INTTEXT tokenHenry Sudhof2010-02-212-2/+8
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0
* | BBCode parser now uses the user object for all settings rather than taking ↵Nils Adermann2010-02-211-1/+1
| | | | | | | | | | | | some from the template object [Bug #57365] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10515 89ea8834-ac86-4346-8a33-228a782c2dd0
* | warn users about TEXTHenry Sudhof2010-02-201-91/+107
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10511 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57755 - Make user_email_hash() function independent from system's ↵Andreas Fischer2010-02-182-3/+5
| | | | | | | | | | | | architecture. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10499 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.Joas Schilling2010-02-171-0/+5
| | | | | | | | | | | | | | Authorised by: bantu git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10496 89ea8834-ac86-4346-8a33-228a782c2dd0
* | r10491 - Also in the Post Settings section. Thanks leviatan21Andreas Fischer2010-02-161-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10492 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Add sql_bit_or() dbal method. Add ability to enable quick reply in all ↵Andreas Fischer2010-02-155-2/+69
| | | | | | | | | | | | forums. -- Voila ;-) git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10491 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Forgot to properly update the file header of mssqlnative.php, revising ↵Nils Adermann2010-02-111-2/+4
| | | | | | | | | | | | r10489 [Bug #57055] git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10490 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris ↵Nils Adermann2010-02-118-2/+775
| | | | | | | | | | | | | | | | | | | | | | | | | | Pucci at Microsoft [Bug #57055] If you are using SQL Server, please try to test this new dbal so we can safely include it in 3.0.8. If you want to try it on a current phpBB version you can apply the latest version of the patch to your board which you can find attached to the bug tracker ticket (look in the comments for the latest version, the one in the ticket itself is outdated): http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=57055 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10489 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57455 - Fix problems with firebird by no longer using 'count' as a ↵Andreas Fischer2010-02-083-5/+6
| | | | | | | | | | | | column alias. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10484 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix #57395, a regression from r10427Josh Woody2010-02-071-1/+1
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10482 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #57345 - No longer return the character O in generated random strings ↵Andreas Fischer2010-02-071-1/+1
| | | | | | | | | | | | and passwords. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10480 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #13181 - Honor minimum and maximum password length in generated ↵Andreas Fischer2010-02-071-5/+6
| | | | | | | | | | | | passwords as much as we can. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10479 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Fix Bug #57385Andreas Fischer2010-02-061-2/+2
| | | | | | | | | | | | | | | | Correctly sort database backup file list by date on database restore page. Take admin's time zone settings into account when listing database backup files. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10478 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Bug #57265 - Convertors cannot read configuration filesJosh Woody2010-02-041-2/+16
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10473 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Slight performance optimisation for r9624 refs #54265Chris Smith2010-02-011-1/+3
| | | | | | | | git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10470 89ea8834-ac86-4346-8a33-228a782c2dd0
* | Change version numbers to 3.0.7 and 3.0.8-dev in preparation for development ↵Nils Adermann2010-02-011-1/+1
|/ | | | | | on next release git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10468 89ea8834-ac86-4346-8a33-228a782c2dd0
* Do not store email templates in database. [Bug #54505]Nils Adermann2010-01-262-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 13:13:03 +0000