makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 19:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

#12731

Browse source 
#12791


git-svn-id: file:///svn/phpbb/trunk@7806 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-06-28 18:21:08 +00:00
parent f9ea21a083
commit 648de4354a
4 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

@ -195,6 +195,8 @@ p a {
<li>[Fix] Display custom profile field &quotdate&quot; based on users language (Bug #12787)</li>
<li>[Fix] Allow adding of help language files within subdirectories (Bug #12783)</li>
<li>[Fix] Correctly apply smileys on posting having # within their emotion code</li>
<li>[Fix] Correctly convert smileys having double quotes within their emotion code (Bug #12731)</li>
</ul>

10
phpBB/includes/functions_convert.php
View file

@ -2413,4 +2413,14 @@ function get_smiley_display()
return ($smiley_count < 50) ? 1 : 0;
}
function fill_dateformat($user_dateformat)
{
global $config;
return ((empty($user_dateformat)) ? $config['default_dateformat'] : $user_dateformat);
}
?>

4
phpBB/install/convertors/convert_phpbb20.php
View file

@ -540,7 +540,7 @@ if (!$get_info)
'autoincrement' => 'smiley_id',
array('smiley_id', 'smilies.smilies_id', ''),
array('code', 'smilies.code', 'phpbb_set_encoding'),
array('code', 'smilies.code', array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
array('emotion', 'smilies.emoticon', 'phpbb_set_encoding'),
array('smiley_url', 'smilies.smile_url', 'import_smiley'),
array('smiley_width', 'smilies.smile_url', 'get_smiley_width'),
@ -862,7 +862,7 @@ if (!$get_info)
array('user_lang', $config['default_lang'], ''),
array('', 'users.user_lang', ''),
array('user_timezone', 'users.user_timezone', ''),
array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding')),
array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')),
array('user_inactive_reason', '', 'phpbb_inactive_reason'),
array('user_inactive_time', '', 'phpbb_inactive_time'),

10
phpBB/install/convertors/functions_phpbb20.php
View file

@ -1439,6 +1439,16 @@ function phpbb_avatar_type($type)
return 0;
}
/**
* Just undos the replacing of '<' and '>'
*/
function phpbb_smilie_html_decode($code)
{
$code = str_replace('&lt;', '<', $code);
return str_replace('&gt;', '>', $code);
}
/**
* Transfer avatars, copying the image if it was uploaded
*/