nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong parameter when calling error.php

Browse Source
This commit is contained in:
Marc Delisle
2006-10-19 20:48:14 +00:00
parent 0564ecc946
commit 6455e65bc9
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$HeadURL$ $HeadURL$
2006-10-19 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, /database_interface.lib.php,/session.inc.php:
wrong parameter "char" when calling error.php, should be "charset"
2006-10-19 Michal Čihař <michal@cihar.com> 2006-10-19 Michal Čihař <michal@cihar.com>
* db_import.php, db_details.php, db_details_export.php, * db_import.php, db_details.php, db_details_export.php,
db_details_structure.php, db_details_qbe.php, db_operations.php, db_details_structure.php, db_details_qbe.php, db_operations.php,

4
libraries/common.lib.php
View File

@@ -2753,7 +2753,7 @@ if (empty($_SESSION['PMA_Config'])) {
if (!function_exists('preg_replace')) { if (!function_exists('preg_replace')) {
header('Location: error.php' header('Location: error.php'
. '?lang=' . urlencode($available_languages[$lang][2]) . '?lang=' . urlencode($available_languages[$lang][2])
. '&char=' . urlencode($charset) . '&charset=' . urlencode($charset)
. '&dir=' . urlencode($text_dir) . '&dir=' . urlencode($text_dir)
. '&type=' . urlencode($strError) . '&type=' . urlencode($strError)
. '&error=' . urlencode( . '&error=' . urlencode(
@@ -3010,7 +3010,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) { if (!file_exists('./libraries/auth/' . $cfg['Server']['auth_type'] . '.auth.lib.php')) {
header('Location: error.php' header('Location: error.php'
. '?lang=' . urlencode($available_languages[$lang][2]) . '?lang=' . urlencode($available_languages[$lang][2])
. '&char=' . urlencode($charset) . '&charset=' . urlencode($charset)
. '&dir=' . urlencode($text_dir) . '&dir=' . urlencode($text_dir)
. '&type=' . urlencode($strError) . '&type=' . urlencode($strError)
. '&error=' . urlencode( . '&error=' . urlencode(

2
libraries/database_interface.lib.php
View File

@@ -58,7 +58,7 @@ if ( ! PMA_DBI_checkAndLoadMysqlExtension( $GLOBALS['cfg']['Server']['extension'
// if alternativ fails too ... // if alternativ fails too ...
header( 'Location: error.php' header( 'Location: error.php'
. '?lang=' . urlencode( $available_languages[$lang][2] ) . '?lang=' . urlencode( $available_languages[$lang][2] )
. '&char=' . urlencode( $charset ) . '&charset=' . urlencode( $charset )
. '&dir=' . urlencode( $text_dir ) . '&dir=' . urlencode( $text_dir )
. '&type=' . urlencode( $strError ) . '&type=' . urlencode( $strError )
. '&error=' . urlencode( . '&error=' . urlencode(

2
libraries/session.inc.php
View File

@@ -25,7 +25,7 @@ if (!@function_exists('session_name')) {
// (do not use &amp; for parameters sent by header) // (do not use &amp; for parameters sent by header)
header('Location: error.php' header('Location: error.php'
. '?lang=' . urlencode($available_languages[$lang][2]) . '?lang=' . urlencode($available_languages[$lang][2])
. '&char=' . urlencode($charset) . '&charset=' . urlencode($charset)
. '&dir=' . urlencode($text_dir) . '&dir=' . urlencode($text_dir)
. '&type=' . urlencode($strError) . '&type=' . urlencode($strError)
. '&error=' . urlencode(sprintf($strCantLoad, 'session'))); . '&error=' . urlencode(sprintf($strCantLoad, 'session')));