diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-07-28 14:24:37 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-07-28 14:24:37 +0000 |
| commit | eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1 (patch) | |
| tree | 14514edf6dc3f86506779b4e8a9d183d88b4ce9c /phpBB/includes/bbcode.php | |
| parent | 6b07f206d581c1404c15875eabd73b9a3d46a826 (diff) | |
| download | forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.gz forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.bz2 forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.tar.xz forums-eda1d40861fb5a2b74e7e5ade618cc9fa83cafd1.zip | |
Okay. Frozen, we never said anything about it being permafrost. Also, this is not 100% tested, expect troubel with store_db (I'm waiting for the bug reports)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8697 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/bbcode.php')
| -rw-r--r-- | phpBB/includes/bbcode.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index ef73762582..fd8fadf3a7 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -134,10 +134,21 @@ class bbcode { $this->template_bitfield = new bitfield($user->theme['bbcode_bitfield']); $this->template_filename = $phpbb_root_path . 'styles/' . $user->theme['template_path'] . '/template/bbcode.html'; - + if (!@file_exists($this->template_filename)) { - trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR); + 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)) + { + trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR); + } + } + else + { + trigger_error('The file ' . $this->template_filename . ' is missing.', E_USER_ERROR); + } } } |