diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-02-23 16:12:51 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-02-23 16:12:51 +0000 |
| commit | 63e07777cd9a5d7ef68693fa7c9098e46493965c (patch) | |
| tree | 8f591380f9487cdf524572deb029fb2427b1a960 /phpBB | |
| parent | bffd7eb6a7a631099f4ad4e151c5a626209f92a9 (diff) | |
| download | forums-63e07777cd9a5d7ef68693fa7c9098e46493965c.tar forums-63e07777cd9a5d7ef68693fa7c9098e46493965c.tar.gz forums-63e07777cd9a5d7ef68693fa7c9098e46493965c.tar.bz2 forums-63e07777cd9a5d7ef68693fa7c9098e46493965c.tar.xz forums-63e07777cd9a5d7ef68693fa7c9098e46493965c.zip | |
Merge r10515 into 3.0.7 branch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/bbcode.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5d517051d0..6df74acc9e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -161,6 +161,7 @@ <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> <li>[Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)</li> <li>[Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)</li> + <li>[Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)</li> <li>[Fix] Ensure a database connection is available before logging general errors. (Bug #57975)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index 304191e38d..d77bb3c4a7 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -137,7 +137,7 @@ class bbcode if (!@file_exists($this->template_filename)) { - if (isset($template->orig_tpl_inherits_id) && $template->orig_tpl_inherits_id) + if (isset($user->theme['template_inherits_id']) && $user->theme['template_inherits_id']) { $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template/bbcode.html'; if (!@file_exists($this->template_filename)) |