diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2004-03-06 16:58:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2004-03-06 16:58:34 +0000 |
| commit | 635d18d279769cfc48ecf1b83e717d3149b663d1 (patch) | |
| tree | 482f74c24b04366b86ee8712c225b2807e4bf347 /phpBB/includes | |
| parent | 91811b8289f733032e00f022a7a39a673ebb73c8 (diff) | |
| download | forums-635d18d279769cfc48ecf1b83e717d3149b663d1.tar forums-635d18d279769cfc48ecf1b83e717d3149b663d1.tar.gz forums-635d18d279769cfc48ecf1b83e717d3149b663d1.tar.bz2 forums-635d18d279769cfc48ecf1b83e717d3149b663d1.tar.xz forums-635d18d279769cfc48ecf1b83e717d3149b663d1.zip | |
minor adjustments
git-svn-id: file:///svn/phpbb/trunk@4859 89ea8834-ac86-4346-8a33-228a782c2dd0
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); |