mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity

Merge pull request #3278 from rxu/ticket/13492

Browse Source 
[ticket/13492] Fix IDN support for custom BBCode URL tokens
This commit is contained in:
Joas Schilling 2015-01-20 17:31:06 +01:00
commit d99cd2d02e
2 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_bbcodes.php
View File

@ -409,7 +409,9 @@ class acp_bbcodes
{
$bbcode_match = trim($bbcode_match);
$bbcode_tpl = trim($bbcode_tpl);
$utf8 = strpos($bbcode_match, 'INTTEXT') !== false;
// Allow unicode characters for URL|LOCAL_URL|RELATIVE_URL|INTTEXT tokens
$utf8 = preg_match('/(URL|LOCAL_URL|RELATIVE_URL|INTTEXT)/', $bbcode_match);
$utf8_pcre_properties = phpbb_pcre_utf8_support();

70
phpBB/phpbb/db/migration/data/v31x/update_custom_bbcodes_with_idn.php Normal file
View File

@ -0,0 +1,70 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v31x;
class update_custom_bbcodes_with_idn extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\v312',
);
}
public function update_data()
{
return array(
array('custom', array(array($this, 'update_bbcodes_table'))),
);
}
public function update_bbcodes_table()
{
if (!class_exists('acp_bbcodes'))
{
include($this->phpbb_root_path . 'includes/acp/acp_bbcodes.' . $this->php_ext);
}
$bbcodes = new \acp_bbcodes();
$sql = 'SELECT bbcode_id, bbcode_match, bbcode_tpl
FROM ' . BBCODES_TABLE;
$result = $this->sql_query($sql);
$sql_ary = array();
while ($row = $this->db->sql_fetchrow($result))
{
$data = array();
if (preg_match('/(URL|LOCAL_URL|RELATIVE_URL)/', $row['bbcode_match']))
{
$data = $bbcodes->build_regexp($row['bbcode_match'], $row['bbcode_tpl']);
$sql_ary[$row['bbcode_id']] = array(
'first_pass_match' => $data['first_pass_match'],
'first_pass_replace' => $data['first_pass_replace'],
'second_pass_match' => $data['second_pass_match'],
'second_pass_replace' => $data['second_pass_replace']
);
}
}
$this->db->sql_freeresult($result);
foreach ($sql_ary as $bbcode_id => $bbcode_data)
{
$sql = 'UPDATE ' . BBCODES_TABLE . '
SET ' . $this->db->sql_build_array('UPDATE', $bbcode_data) . '
WHERE bbcode_id = ' . (int) $bbcode_id;
$this->sql_query($sql);
}
}
}