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

Merge branch 'QA_3_3'

Browse Source 
Conflicts:
	libraries/core.lib.php
	server_databases.php
	server_privileges.php
This commit is contained in:
Michal Čihař
2010-08-20 13:40:37 +02:00
parent 7b1c0187cf 41145feb12
commit 862e3ca2a7
16 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
error.php
View File

@@ -75,10 +75,14 @@ header('Content-Type: text/html; charset=' . $charset);
<body>
<h1>phpMyAdmin - <?php echo $type; ?></h1>
<p><?php
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
echo PMA_sanitize(stripslashes($_REQUEST['error']));
if (!empty($_REQUEST['error'])) {
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
echo PMA_sanitize(stripslashes($_REQUEST['error']));
} else {
echo PMA_sanitize($_REQUEST['error']);
}
} else {
echo PMA_sanitize($_REQUEST['error']);
echo 'No error message!';
}
?></p>
</body>