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

Fix for bug #582890

Browse Source
This commit is contained in:
Robin Johnson
2002-08-11 08:09:05 +00:00
parent 2fc7634686
commit 5a9011ff6f
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@@ -7,10 +7,17 @@ $Source$
2002-08-10 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/string.lib.php3:
- Fix for bug #593386 might need more work depending on character set
research. We will need to end up knowing the character set MySQL is
using to do it totally right.
- Fix for bug #593386
Might need more work depending on character set
research. We will need to end up knowing the
character set MySQL is using to do it totally right.
* libraries/common.lib.php3:
- Fix for bug #582890
Just detects for connect_type == 'tcp' before
empty host. Might need better long term fix to
detect socket connect_type, and check that a
value exists for it, even if it is only the default.
2002-08-10 Marc Delisle <lem9@users.sourceforge.net>
* lang/french: update.

8
libraries/common.lib.php3
View File

@@ -514,7 +514,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold}
reset($cfg['Servers']);
while (list($key, $val) = each($cfg['Servers'])) {
// Don't use servers with no hostname
if (empty($val['host'])) {
if ( ($val['connect_type'] == 'tcp') && empty($val['host']) ) {
unset($cfg['Servers'][$key]);
}
}
@@ -1116,7 +1116,7 @@ if (typeof(document.getElementById) != 'undefined'
/* SQL-Parser-Analyzer */
$sqlnr = 1;
if (!empty($GLOBALS['show_as_php'])) {
$new_line = '&quot;;<br />' . "\n" . ' $sql .= &quot;';
$new_line = '\';<br />' . "\n" . ' $sql .= \'';
}
if (isset($new_line)) {
/* SQL-Parser-Analyzer */
@@ -1127,7 +1127,7 @@ if (typeof(document.getElementById) != 'undefined'
$query_base = $GLOBALS['sql_query'];
}
if (!empty($GLOBALS['show_as_php'])) {
$query_base = '$sql = &quot;' . $query_base;
$query_base = '$sql = \'' . PMA_sqlAddslashes($query_base);
} else if (!empty($GLOBALS['validatequery'])) {
$query_base = PMA_validateSQL($query_base);
} else {
@@ -1250,7 +1250,7 @@ if (typeof(document.getElementById) != 'undefined'
//Clean up the end of the PHP
if (!empty($GLOBALS['show_as_php'])) {
echo '&quot;;';
echo '\';';
}
echo "\n";
?>