diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-08 15:20:57 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-08 15:20:57 +0000 |
| commit | 1c41450bd90f86f47521952e7f48339f103b8e5d (patch) | |
| tree | 3ec8b226ce76e5ba5de810e7e1325047851f3716 /phpBB/includes/message_parser.php | |
| parent | 4519c510663b5c5168d6594d9eb96819a0c6bae0 (diff) | |
| download | forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.gz forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.bz2 forums-1c41450bd90f86f47521952e7f48339f103b8e5d.tar.xz forums-1c41450bd90f86f47521952e7f48339f103b8e5d.zip | |
- re-add script_path for "strange configurations" to let them force the generated urls correctly
- show rank title if no rank image present in memberlist
- other fixes.
git-svn-id: file:///svn/phpbb/trunk@6730 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 285b0d0649..ed6f69cf49 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -840,7 +840,14 @@ class bbcode_firstpass extends bbcode { global $config, $phpEx, $user; - $check_path = ($user->page['root_script_path'] != '/') ? substr($user->page['root_script_path'], 0, -1) : '/'; + if ($config['force_server_vars']) + { + $check_path = $config['script_path']; + } + else + { + $check_path = ($user->page['root_script_path'] != '/') ? substr($user->page['root_script_path'], 0, -1) : '/'; + } // Is the user trying to link to a php file in this domain and script path? if (strpos($url, ".{$phpEx}") !== false && strpos($url, $check_path) !== false) |