makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/12274' into develop

Browse source 
* 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
This commit is contained in:
Joas Schilling 2014-03-16 23:05:24 +01:00
commit cdbc1e8a5c
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/adm/style/install_footer.html
View file

@ -11,6 +11,7 @@
<script type="text/javascript" src="{T_JQUERY_LINK}"></script> <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 --> <!-- 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 --> <!-- INCLUDEJS admin.js -->
{$SCRIPTS} {$SCRIPTS}

10
phpBB/install/index.php
View file

@ -252,8 +252,10 @@ $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_p
$paths = array_filter($paths, 'is_dir'); $paths = array_filter($paths, 'is_dir');
$template->set_custom_style('adm', $paths); $template->set_custom_style('adm', $paths);
$template->assign_var('T_ASSETS_PATH', '../assets'); $path = array_shift($paths);
$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
$template->assign_var('T_ASSETS_PATH', $path . '/../../assets');
$template->assign_var('T_TEMPLATE_PATH', $path);
$install = new module(); $install = new module();
@ -397,7 +399,7 @@ class module
} }
define('HEADER_INC', true); 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( $template->assign_vars(array(
'L_CHANGE' => $lang['CHANGE'], 'L_CHANGE' => $lang['CHANGE'],
@ -407,7 +409,7 @@ class module
'L_SKIP' => $lang['SKIP'], 'L_SKIP' => $lang['SKIP'],
'PAGE_TITLE' => $this->get_page_title(), 'PAGE_TITLE' => $this->get_page_title(),
'T_IMAGE_PATH' => htmlspecialchars($phpbb_admin_path) . 'images/', '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_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_FLOW_BEGIN' => ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right', 'S_CONTENT_FLOW_BEGIN' => ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',