diff options
| author | Matt Friedman <maf675@gmail.com> | 2014-03-16 07:22:24 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2014-03-16 07:22:24 -0700 |
| commit | 81ceefd889138632f17fd0c9863aab664915dc6d (patch) | |
| tree | 2076f9835d192bb2d8b13ef66561ea1be3c3e206 /phpBB/install/index.php | |
| parent | fd6836ca8a15c90da6ba7b39b5a6479fec2a6871 (diff) | |
| download | forums-81ceefd889138632f17fd0c9863aab664915dc6d.tar forums-81ceefd889138632f17fd0c9863aab664915dc6d.tar.gz forums-81ceefd889138632f17fd0c9863aab664915dc6d.tar.bz2 forums-81ceefd889138632f17fd0c9863aab664915dc6d.tar.xz forums-81ceefd889138632f17fd0c9863aab664915dc6d.zip | |
[ticket/12274] Fix broke/missing jQuery asset paths in update script
PHPBB3-12274
Diffstat (limited to 'phpBB/install/index.php')
| -rw-r--r-- | phpBB/install/index.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 6c6e71aa06..b18a9dce1b 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -252,8 +252,10 @@ $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_p $paths = array_filter($paths, 'is_dir'); $template->set_custom_style('adm', $paths); -$template->assign_var('T_ASSETS_PATH', '../assets'); -$template->assign_var('T_TEMPLATE_PATH', array_shift($paths)); +$path = array_shift($paths); + +$template->assign_var('T_ASSETS_PATH', $path . '/../../assets'); +$template->assign_var('T_TEMPLATE_PATH', $path); $install = new module(); @@ -397,7 +399,7 @@ class module } define('HEADER_INC', true); - global $template, $lang, $stage, $phpbb_root_path, $phpbb_admin_path; + global $template, $lang, $stage, $phpbb_admin_path, $path; $template->assign_vars(array( 'L_CHANGE' => $lang['CHANGE'], @@ -407,7 +409,7 @@ class module 'L_SKIP' => $lang['SKIP'], 'PAGE_TITLE' => $this->get_page_title(), 'T_IMAGE_PATH' => htmlspecialchars($phpbb_admin_path) . 'images/', - 'T_JQUERY_LINK' => $phpbb_root_path . 'assets/javascript/jquery.js', + 'T_JQUERY_LINK' => $path . '/../../assets/javascript/jquery.js', 'S_CONTENT_DIRECTION' => $lang['DIRECTION'], 'S_CONTENT_FLOW_BEGIN' => ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right', |