The branch, master has been updated via 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 (commit) from 7bda45ba6614d02b16e2f3812b0932abb9e712fa (commit)
- Log ----------------------------------------------------------------- commit 4841ee9d5f9926187b0eb8b23e6dd87af2daeab4 Author: Michal Čihař mcihar@novell.com Date: Fri Jun 3 13:32:53 2011 +0200
Use standard mechanism for loading javascript to prevent multiple requests to server
-----------------------------------------------------------------------
Summary of changes: navigation.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/navigation.php b/navigation.php index dc68489..e9b2236 100644 --- a/navigation.php +++ b/navigation.php @@ -136,11 +136,13 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&js_frame=left&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> - <script src="./js/jquery/jquery-1.6.1.js" type="text/javascript"></script> - <script src="./js/jquery/jquery-ui-1.8.custom.js" type="text/javascript"></script> - <script type="text/javascript" src="js/navigation.js"></script> - <script type="text/javascript" src="js/functions.js"></script> - <script type="text/javascript" src="js/messages.php"></script> + <?php + echo PMA_includeJS('jquery/jquery-1.6.1.js'); + echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); + echo PMA_includeJS('navigation.js'); + echo PMA_includeJS('functions.js'); + echo PMA_includeJS('messages.php'); + ?> <script type="text/javascript"> // <![CDATA[ var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png';
hooks/post-receive