diff --git a/ChangeLog b/ChangeLog
index 0591bfc6b..fae631428 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
 
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 9da366f75..638c17934 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -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";
             ?>