mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 01:36:57 +02:00
Code Issues Releases Wiki Activity

More fixes

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-2_0_0@3223 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-12-21 21:49:21 +00:00
parent 5d8b228bb0
commit 11a9511c75
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/emailer.php
View File

@@ -92,7 +92,12 @@ class emailer
if ( !file_exists(phpbb_realpath($this->tpl_file)) )
{
message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
$this->tpl_file = @phpbb_realpath($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/email/' . $template_file . '.tpl');
if ( !file_exists(phpbb_realpath($this->tpl_file)) )
{
message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
}
}
if ( !$this->load_msg() )

2
phpBB/includes/functions_post.php
View File

@@ -776,7 +776,7 @@ function generate_smilies($mode, $page_id)
{
if (empty($rowset[$row['smile_url']]))
{
$rowset[$row['smile_url']]['code'] = str_replace('\\', '\\\\', str_replace("'", "\\'", $row['code']));
$rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
$num_smilies++;
}