diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-16 23:05:24 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-16 23:05:24 +0100 |
| commit | cdbc1e8a5c48aae974c7c539a662b201c0c1ae40 (patch) | |
| tree | 65940f8bb30e4d712a521d271477c2e6b1bd6f5a | |
| parent | 5f70518987838b927ebeae504113cb4bc6e8f722 (diff) | |
| parent | a29ad78da61e8eb805acb3bb1b06cca7e889e9ce (diff) | |
| download | forums-cdbc1e8a5c48aae974c7c539a662b201c0c1ae40.tar forums-cdbc1e8a5c48aae974c7c539a662b201c0c1ae40.tar.gz forums-cdbc1e8a5c48aae974c7c539a662b201c0c1ae40.tar.bz2 forums-cdbc1e8a5c48aae974c7c539a662b201c0c1ae40.tar.xz forums-cdbc1e8a5c48aae974c7c539a662b201c0c1ae40.zip | |
Merge remote-tracking branch 'vsephpbb/ticket/12274' into develop
* vsephpbb/ticket/12274:
[ticket/12274] Add core.js to the install footer
[ticket/12274] Fix broke/missing jQuery asset paths in update script
[ticket/12274] Load correct T_TEMPLATE_PATH during update
| -rw-r--r-- | phpBB/adm/style/install_footer.html | 1 | ||||
| -rw-r--r-- | phpBB/install/index.php | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/adm/style/install_footer.html b/phpBB/adm/style/install_footer.html index c5356e7b9d..822ab76313 100644 --- a/phpBB/adm/style/install_footer.html +++ b/phpBB/adm/style/install_footer.html @@ -11,6 +11,7 @@ <script type="text/javascript" src="{T_JQUERY_LINK}"></script> <!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF --> +<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script> <!-- INCLUDEJS admin.js --> {$SCRIPTS} diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 2e09e95ea7..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', $phpbb_admin_path . 'style'); +$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', |