moved setting of cookies into index.php

This commit is contained in:
Sebastian Mendel
2005-11-24 17:23:46 +00:00
parent b9888e570d
commit 81cd3d35dc
3 changed files with 12 additions and 8 deletions

View File

@@ -35,6 +35,7 @@ $Source$
* libraries/url_generating.lib.php:
- dont add variables already in cookie (reduces html output up to 30%)
- can pass all url variables as array to function
* main.php, index.php: moved setting of cookies into index.php
2005-11-23 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* *REVERTED* libraries/display_select_lang.lib.php: correct lang definition

View File

@@ -38,6 +38,12 @@
* Gets core libraries and defines some variables
*/
require_once('./libraries/common.lib.php');
setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https);
if (isset($convcharset)) {
setcookie('pma_charset', $convcharset, time() + 60*60*24*30, $cookie_path, '', $is_https);
}
/**
* Includes the ThemeManager if it hasn't been included yet
*/

View File

@@ -11,10 +11,6 @@ define('PMA_DISPLAY_HEADING', 0);
* Gets some core libraries and displays a top message if required
*/
require_once('./libraries/common.lib.php');
setcookie('pma_lang', $lang, time() + 60*60*24*30, $cookie_path, '', $is_https);
if (isset($convcharset)) {
setcookie('pma_charset', $convcharset, time() + 60*60*24*30, $cookie_path, '', $is_https);
}
/**
* Includes the ThemeManager
@@ -64,6 +60,7 @@ if ( $server > 0 ) {
}
?>
<div id="mysqlmaininformation">
<?php
// robbat2: Use the verbose name of the server instead of the hostname