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/install/install_update.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/install/install_update.php')
| -rw-r--r-- | phpBB/install/install_update.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 2a6de60d47..fed66a0a07 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -412,6 +412,7 @@ class install_update extends module // To ease the update process create a file location map $update_list = $cache->get('_update_list'); + $script_path = ($config['force_server_vars']) ? (($config['script_path'] == '/') ? '/' : $config['script_path'] . '/') : $user->page['root_script_path']; foreach ($update_list as $status => $files) { @@ -429,7 +430,7 @@ class install_update extends module $template->assign_block_vars('location', array( 'SOURCE' => htmlspecialchars($file_struct['filename']), - 'DESTINATION' => $user->page['root_script_path'] . htmlspecialchars($file_struct['filename']), + 'DESTINATION' => $script_path . htmlspecialchars($file_struct['filename']), )); } } |