mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/admin/admin_smilies.php
View File

@ -405,7 +405,7 @@ else if ( $mode != "" )
$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']); $smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
// If no code was entered complain ... // If no code was entered complain ...
if ($smile_code == '' || $smile_url = '') if ($smile_code == '' || $smile_url == '')
{ {
message_die(MESSAGE, $lang['Fields_empty']); message_die(MESSAGE, $lang['Fields_empty']);
} }
@ -422,8 +422,7 @@ else if ( $mode != "" )
$sql = "UPDATE " . SMILIES_TABLE . " $sql = "UPDATE " . SMILIES_TABLE . "
SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "' SET code = '" . str_replace("\'", "''", $smile_code) . "', smile_url = '" . str_replace("\'", "''", $smile_url) . "', emoticon = '" . str_replace("\'", "''", $smile_emotion) . "'
WHERE smilies_id = $smile_id"; WHERE smilies_id = $smile_id";
$result = $db->sql_query($sql); if( !($result = $db->sql_query($sql)) )
if( !$result )
{ {
message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, "Couldn't update smilies info", "", __LINE__, __FILE__, $sql);
} }

2
phpBB/docs/CHANGELOG.html
View File

@ -168,6 +168,8 @@ p,ul,td {font-size:10pt;}
<li>Added check for invalid (non-compliant) email addresses to upgrade script</li> <li>Added check for invalid (non-compliant) email addresses to upgrade script</li>
<li>Further redirect workarounds for broken servers, please direct further issues to the vendors</li> <li>Further redirect workarounds for broken servers, please direct further issues to the vendors</li>
<li>Added GMT + 13 to English lang_main, all translators are encouraged to do likewise</li> <li>Added GMT + 13 to English lang_main, all translators are encouraged to do likewise</li>
<li>Added switch to default_lang email template if user lang template no longer exists</li>
<li>Fixed javascript error when selecting smiley containing a single quote</li>
<li></li> <li></li>
</ul> </ul>

5
phpBB/includes/emailer.php
View File

@ -90,10 +90,15 @@ class emailer
$this->tpl_file = @phpbb_realpath($phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl'); $this->tpl_file = @phpbb_realpath($phpbb_root_path . 'language/lang_' . $template_lang . '/email/' . $template_file . '.tpl');
if ( !file_exists(phpbb_realpath($this->tpl_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)) ) if ( !file_exists(phpbb_realpath($this->tpl_file)) )
{ {
message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__); message_die(GENERAL_ERROR, 'Could not find email template file ' . $template_file, '', __LINE__, __FILE__);
} }
}
if ( !$this->load_msg() ) 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']])) 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']; $rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
$num_smilies++; $num_smilies++;
} }