mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Fix for bug #505883
git-svn-id: file:///svn/phpbb/trunk@1936 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ddb00d8173
commit
f332b92ec0
1 changed files with 24 additions and 2 deletions
|
@ -144,6 +144,11 @@ if( isset($HTTP_GET_VARS['import_pack']) || isset($HTTP_POST_VARS['import_pack']
|
|||
|
||||
for( $j = 2; $j < count($smile_data); $j++)
|
||||
{
|
||||
//
|
||||
// Replace > and < with the proper html_entities for matching.
|
||||
//
|
||||
$smile_data[$j] = str_replace("<", "<", $smile_data[$j]);
|
||||
$smile_data[$j] = str_replace(">", ">", $smile_data[$j]);
|
||||
$k = $smile_data[$j];
|
||||
|
||||
if( $smiles[$k] == 1 )
|
||||
|
@ -396,6 +401,11 @@ else if ( $mode != "" )
|
|||
$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
|
||||
$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
|
||||
$smile_id = ( isset($HTTP_POST_VARS['smile_id']) ) ? intval($HTTP_POST_VARS['smile_id']) : intval($HTTP_GET_VARS['smile_id']);
|
||||
//
|
||||
// Convert < and > to proper htmlentities for parsing.
|
||||
//
|
||||
$smile_code = str_replace('<', '<', $smile_code);
|
||||
$smile_code = str_replace('>', '>', $smile_code);
|
||||
|
||||
//
|
||||
// Proceed with updating the smiley table.
|
||||
|
@ -427,6 +437,12 @@ else if ( $mode != "" )
|
|||
$smile_url = ( isset($HTTP_POST_VARS['smile_url']) ) ? $HTTP_POST_VARS['smile_url'] : $HTTP_GET_VARS['smile_url'];
|
||||
$smile_emotion = ( isset($HTTP_POST_VARS['smile_emotion']) ) ? $HTTP_POST_VARS['smile_emotion'] : $HTTP_GET_VARS['smile_emotion'];
|
||||
|
||||
//
|
||||
// Convert < and > to proper htmlentities for parsing.
|
||||
//
|
||||
$smile_code = str_replace('<', '<', $smile_code);
|
||||
$smile_code = str_replace('>', '>', $smile_code);
|
||||
|
||||
//
|
||||
// Save the data to the smiley table.
|
||||
//
|
||||
|
@ -487,6 +503,12 @@ else
|
|||
//
|
||||
for($i = 0; $i < count($smilies); $i++)
|
||||
{
|
||||
//
|
||||
// Replace htmlentites for < and > with actual character.
|
||||
//
|
||||
$smilies[$i]['code'] = str_replace('<', '<', $smilies[$i]['code']);
|
||||
$smilies[$i]['code'] = str_replace('>', '>', $smilies[$i]['code']);
|
||||
|
||||
$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
|
||||
$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue