diff options
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 364855ebb8..33a3c5ac30 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -138,7 +138,7 @@ class parse_message $replace = array(); // relative urls for this board - $match[] = '#(^|[\n ])' . $server_protocol . trim($config['server_name']) . $server_port . preg_replace('/^\/?(.*?)(\/)?$/', '$1', trim($config['script_path'])) . '/([^ \t\n\r<"\']+)#i'; + $match[] = '#(^|[\n ])' . $server_protocol . trim($config['server_name']) . $server_port . preg_replace('/^\/?(.*?)(\/)?$/', '$1', trim($config['script_path'])) . '(?:/[^ \t\n\r<"\']*)?)#i'; $replace[] = '<!-- l --><a href="$1" target="_blank">$1</a><!-- l -->'; // matches a xxxx://aaaaa.bbb.cccc. ... diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index f2bd4a4d6d..160a3ef6cf 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -590,6 +590,10 @@ class user extends session { foreach ($lang_set as $key => $lang_file) { + // Please do not delete this line. + // We have to force the type here, else [array] language inclusion will not work + $key = (string) $key; + if ($key == 'db') { $this->add_lang($lang_file, true, $use_help); |