diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:32:32 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:32:32 -0700 |
| commit | f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5 (patch) | |
| tree | c06d87ffc80a767f49b086d794dbc57c3a944303 | |
| parent | f514269846263fc1958ba28d702cd27d6efdb5b4 (diff) | |
| parent | c1bb179914e4f47876d87aba21ab65e01f79d69c (diff) | |
| download | forums-f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5.tar forums-f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5.tar.gz forums-f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5.tar.bz2 forums-f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5.tar.xz forums-f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5.zip | |
Merge pull request #1549 from cyberalien/ticket/10999
[ticket/10999] Fix assets_version in ACP
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_acp.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 54ed4dcc9e..9202cec06b 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -38,7 +38,7 @@ <!-- IF S_JQUERY_FALLBACK --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.js?assets_version={T_ASSETS_VERSION}" 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 ajax.js --> -{SCRIPTS} +{$SCRIPTS} <!-- EVENT acp_overall_footer_after --> diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index ff0e2a1ac1..60c44e90e1 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -82,6 +82,8 @@ function adm_page_header($page_title) 'T_RANKS_PATH' => "{$phpbb_root_path}{$config['ranks_path']}/", 'T_UPLOAD_PATH' => "{$phpbb_root_path}{$config['upload_path']}/", + 'T_ASSETS_VERSION' => $config['assets_version'], + 'ICON_MOVE_UP' => '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', 'ICON_MOVE_UP_DISABLED' => '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_up_disabled.gif" alt="' . $user->lang['MOVE_UP'] . '" title="' . $user->lang['MOVE_UP'] . '" />', 'ICON_MOVE_DOWN' => '<img src="' . htmlspecialchars($phpbb_admin_path) . 'images/icon_down.gif" alt="' . $user->lang['MOVE_DOWN'] . '" title="' . $user->lang['MOVE_DOWN'] . '" />', |