From 6b99b85c8f2f366d8e5e3e2855d77b0832d141d7 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sun, 21 Feb 2010 01:31:10 +0000 Subject: [PATCH] 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 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/bbcode.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7a2c551af7..57716a9350 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -174,6 +174,7 @@
  • [Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)
  • [Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)
  • [Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)
    • +
  • [Fix] BBCode parser now uses the user object for all settings rather than taking some from the template object (Bug #57365)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index f58852c00b..e41053d936 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))