diff options
| author | Tyron Madlener <tyronx@gmail.com> | 2011-06-06 16:38:56 +0400 |
|---|---|---|
| committer | Tyron Madlener <tyronx@gmail.com> | 2011-06-06 16:38:56 +0400 |
| commit | 5e094266669b0ec306e7a836154373a52766fd98 (patch) | |
| tree | e4b2447382e5d11c767ffc346e4f49d542dd63d3 /navigation.php | |
| parent | 9abc87d3a5915783f6e71ea56eefbce4c3196616 (diff) | |
Merge
Diffstat (limited to 'navigation.php')
| -rw-r--r-- | navigation.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/navigation.php b/navigation.php index dc68489d01..76f5b98055 100644 --- a/navigation.php +++ b/navigation.php @@ -11,7 +11,6 @@ * @uses $GLOBALS['available_languages'] * @uses $GLOBALS['lang'] * @uses $GLOBALS['text_dir'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['pmaThemeImage'] * @uses $GLOBALS['cfg']['LeftFrameLight'] * @uses $GLOBALS['cfg']['ShowTooltip'] @@ -118,7 +117,7 @@ require_once './libraries/header_http.inc.php'; * Displays the frame */ // xml declaration moves IE into quirks mode, making much trouble with CSS -/* echo '<?xml version="1.0" encoding="' . $GLOBALS['charset'] . '"?>'; */ +/* echo '<?xml version="1.0" encoding="utf-8"?>'; */ ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -131,16 +130,17 @@ require_once './libraries/header_http.inc.php'; <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title>phpMyAdmin</title> - <meta http-equiv="Content-Type" - content="text/html; charset=<?php echo $GLOBALS['charset']; ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <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'; |