aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVjacheslav Trushkin <cyberalien@gmail.com>2013-07-13 13:30:33 -0400
committerVjacheslav Trushkin <cyberalien@gmail.com>2013-07-13 13:30:33 -0400
commitc1bb179914e4f47876d87aba21ab65e01f79d69c (patch)
tree220c420f07ee196219973f218200aa3705f4eb6b
parentb607b3eab8b221056abf6f87901128bbe3f207b0 (diff)
downloadforums-c1bb179914e4f47876d87aba21ab65e01f79d69c.tar
forums-c1bb179914e4f47876d87aba21ab65e01f79d69c.tar.gz
forums-c1bb179914e4f47876d87aba21ab65e01f79d69c.tar.bz2
forums-c1bb179914e4f47876d87aba21ab65e01f79d69c.tar.xz
forums-c1bb179914e4f47876d87aba21ab65e01f79d69c.zip
[ticket/10999] Fix assets_version in ACP
PHPBB3-10999
-rw-r--r--phpBB/adm/style/overall_footer.html2
-rw-r--r--phpBB/includes/functions_acp.php2
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'] . '" />',