1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

9174 Commits

Author SHA1 Message Date
Nils Adermann
05b5dc3167 Tagging the 3.0.7-RC2 release.
git-svn-id: file:///svn/phpbb/tags/release_3_0_7-RC2@10535 89ea8834-ac86-4346-8a33-228a782c2dd0
release-3.0.7-RC2
2010-02-24 01:21:06 +00:00
Nils Adermann
f9a01af732 prepare build script for RC2
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10534 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-24 00:45:47 +00:00
Nils Adermann
82219d51c2 Merge r10528 into 3.0.7: 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]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10533 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-24 00:08:13 +00:00
Nils Adermann
4c2421dc1e Previous version bump commit r10506 was missing schema_data.sql so that has been updated to 3.0.7-RC2 as well now
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10532 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:59:08 +00:00
Nils Adermann
775f8981f8 Merging r10514 into 3.0.7: Bugs #53925 and #52085 - Language fixes related to the quick reply settings
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10531 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:50:36 +00:00
Nils Adermann
3a48b03547 Merging r10491 and r10492: Add sql_bit_or() dbal method. Add ability to enable quick reply in all forums. -- Voila ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10529 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 23:46:43 +00:00
Andreas Fischer
d3459b3f49 Merge r10526 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10527 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 19:07:25 +00:00
Nils Adermann
63e07777cd Merge r10515 into 3.0.7 branch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 16:12:51 +00:00
Nils Adermann
bffd7eb6a7 Merge r10522 into 3.0.7 branch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10523 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-23 16:09:02 +00:00
Andreas Fischer
4f439593ce Merge r10520 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10521 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 19:37:09 +00:00
Chris Smith
87bc1c6760 sneak attack merge r10518
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10519 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-22 00:59:27 +00:00
Henry Sudhof
9aa4a822ef Enter stage left: the INTTEXT token (merge)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10517 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-21 11:35:45 +00:00
Henry Sudhof
aa2d9e6765 propdel
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10513 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 20:44:06 +00:00
Henry Sudhof
d7f4922993 merging TEXT warn from 3_0_0
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10512 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 16:44:00 +00:00
Chris Smith
a63ceb28e2 merge in r10509
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-20 00:15:35 +00:00
Josh Woody
fff87d544d #57715 - Correct behavior of "force_approved_state" when value is false.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10507 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 04:56:06 +00:00
Andreas Fischer
5ae48dd873 Bump version to 3.0.7-RC2.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10506 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 02:14:02 +00:00
Andreas Fischer
19da9ac065 Merge r10503, r10504 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10505 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 02:13:15 +00:00
Andreas Fischer
dccd529498 Merge r10497 and r10499 into 3.0.7 - #57755
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:40:51 +00:00
Andreas Fischer
b68d23347a Merge r10488 into 3.0.7 branch. #57505
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10501 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-18 01:31:06 +00:00
Joas Schilling
0ddc370386 Merge r10496 - Bug #57795 - [Fix] Restrict search for language/../iso.txt to folders.
Authorised by: bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10498 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 18:40:22 +00:00
Andreas Fischer
6a9e5ea78f Merge r10493, r10494 - #57825
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10495 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-17 10:03:29 +00:00
Andreas Fischer
8682f644e5 Merge r10484 and r10485 into 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10486 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-08 16:54:39 +00:00
Josh Woody
f631d62508 Fix #57395, a regression from r10427
(merging r10482 into branch_3_0_7)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10483 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-07 01:06:37 +00:00
Josh Woody
4a17abbcc4 Merge r10473 into the 3.0.7 branch.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10476 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-04 01:07:30 +00:00
Josh Woody
dec3e2f728 Merge r10472 and r10474 into the 3.0.7 branch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-04 01:06:25 +00:00
Nils Adermann
20301d6b9f Change version numbers to 3.0.7 and 3.0.7-RC1 for a QA release
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10467 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-01 00:49:35 +00:00
Nils Adermann
f68f33780d Creating branch for 3.0.7 release.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10466 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-02-01 00:18:01 +00:00
Nils Adermann
9487673f9c Adding the phpBB build script. This is the latest version of the script Meik 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
2010-02-01 00:03:26 +00:00
Nils Adermann
926d0f980e fix_files script must have been broken by svn:eol-style quite a while ago, 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
2010-01-31 21:50:10 +00:00
Chris Smith
edd57359c8 Hopefully nobody will notice me sneaking this one in:
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
2010-01-31 14:47:34 +00:00
Andreas Fischer
2906a24122 Bug #56545 - Speed up topic move operation by adding an index for topic_id on the topics track table.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10462 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 23:15:25 +00:00
Nils Adermann
c0cd713f4c Updated AUTHORS file, hope I didn't get any names wrong ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10461 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-28 21:19:43 +00:00
Nils Adermann
6e31ce8573 Do not store email templates in database. [Bug #54505]
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
2010-01-26 16:52:46 +00:00
Henry Sudhof
81e62b4da8 okay, now the confirm_id is no longer enough to get a new row into the qa table
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10459 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 15:34:21 +00:00
Josh Woody
8fa06090c4 Add a warning for users of old PHP versions about ending support.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10458 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 15:26:07 +00:00
Henry Sudhof
62d7e3c634 erm, that wouldn't work
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10457 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:58:55 +00:00
Ruslan Uzdenov
5df687f820 Fix bugs #55485 and #55545 - styles adjustment to correctly display an order 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
2010-01-26 14:11:00 +00:00
Joas Schilling
283ad368eb Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:06:00 +00:00
Henry Sudhof
8a9c7c92be tuning
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10454 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:01:20 +00:00
Henry Sudhof
3e224cf856 debug code, begone
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10453 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:41:43 +00:00
Henry Sudhof
ac27e1961a doc
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10452 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:11:15 +00:00
Henry Sudhof
345de34ac1 tuning
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10451 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 11:07:47 +00:00
Henry Sudhof
b4c87cc504 ACP usability
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10450 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 10:57:00 +00:00
Josh Woody
b4d6b1e980 Further fixes for r10447 and r10448. Correctly account for custom language directories (caught by naderman)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10449 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 04:11:58 +00:00
Josh Woody
a314b2807f Remove needless check (revising r10447)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10448 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 03:43:02 +00:00
Josh Woody
ff1aa876b5 Fall back to board default language email template if the file does not exist user's preferred language (#35595)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10447 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 03:30:43 +00:00
Nils Adermann
870921c872 Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL <= 7.4 [Bug #54435]
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10446 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 02:06:37 +00:00
Andreas Fischer
5306a586b1 Revert r9564, Fix #54445, Related to #44665.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10445 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-25 18:42:04 +00:00
Cullen Walsh
bdd81806f2 Ignore that last commit message in r10443.
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
2010-01-25 18:24:57 +00:00