makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge r10515 into 3.0.7 branch

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10524 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann 2010-02-23 16:12:51 +00:00
parent bffd7eb6a7
commit 63e07777cd
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -161,6 +161,7 @@
<li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li>
<li>[Fix] Correct behavior of &quot;force_approved_state&quot; when value is false. (Bug #57715)</li> <li>[Fix] Correct behavior of &quot;force_approved_state&quot; 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] 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>[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] 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> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>

2
phpBB/includes/bbcode.php
View file

@ -137,7 +137,7 @@ class bbcode
if (!@file_exists($this->template_filename)) 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'; $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_inherit_path'] . '/template/bbcode.html';
if (!@file_exists($this->template_filename)) if (!@file_exists($this->template_filename))