diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:32:36 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-11-18 19:32:36 +0100 |
| commit | 665982bb324c1b846d68ebd296eed3a83edb9d81 (patch) | |
| tree | 6d608862bba9600586e9253932cf8302cef58b04 /phpBB | |
| parent | cfaf0e1e96cb757e02a5ea794a20cd895ef72ea8 (diff) | |
| parent | 3091efc501c7e0d5d0a49cb496364f373a4d0184 (diff) | |
| download | forums-665982bb324c1b846d68ebd296eed3a83edb9d81.tar forums-665982bb324c1b846d68ebd296eed3a83edb9d81.tar.gz forums-665982bb324c1b846d68ebd296eed3a83edb9d81.tar.bz2 forums-665982bb324c1b846d68ebd296eed3a83edb9d81.tar.xz forums-665982bb324c1b846d68ebd296eed3a83edb9d81.zip | |
Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympus
* github-rxu/ticket/9416:
[ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7f6e3c0250..789773e349 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -504,7 +504,7 @@ if (!$get_info) array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), array('topic_first_post_id', 'topics.topic_first_post_id', ''), array('topic_last_view_time', 'posts.post_time', 'intval'), - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), + array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')), array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), array('poll_max_options', 1, ''), @@ -537,7 +537,7 @@ if (!$get_info) array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), array('topic_first_post_id', 'topics.topic_first_post_id', ''), - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), + array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')), array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), array('poll_max_options', 1, ''), @@ -582,7 +582,7 @@ if (!$get_info) array('poll_option_id', 'vote_results.vote_option_id', ''), array('topic_id', 'vote_desc.topic_id', ''), array('', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('poll_option_text', 'vote_results.vote_option_text', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), + array('poll_option_text', 'vote_results.vote_option_text', array('function1' => 'phpbb_set_encoding', 'function2' => 'htmlspecialchars_decode', 'function3' => 'utf8_htmlspecialchars')), array('poll_option_total', 'vote_results.vote_result', ''), 'where' => 'vote_results.vote_id = vote_desc.vote_id', |