diff --git a/ChangeLog b/ChangeLog
index 5f57eda3bc..dde630345e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@ $Source$
 
 2003-02-26 Garvin Hicking <me@supergarv.de>
     * lang/german-*: better grammar. ;)
+    * libraries/display_tbl.lib.php3: Fixed transformation-link variable
+      usage for special queries like 'SHOW FIELDS', where certain variables are
+      not set.
     
 2003-02-25 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php3: undefined variable $comment
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 0e16af25f8..2deb8a0f3d 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1023,10 +1023,10 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                 }
 
                 $transform_options['wrapper_link'] = '?'
-                                                    . $url_query
-                                                    . '&amp;primary_key=' . $uva_condition
-                                                    . '&amp;sql_query=' . urlencode($sql_query)
-                                                    . '&amp;goto=' . urlencode($lnk_goto)
+                                                    . (isset($url_query) ? $url_query : '')
+                                                    . '&amp;primary_key=' . (isset($uva_condition) ? $uva_condition : '')
+                                                    . '&amp;sql_query=' . (isset($sql_query) ? urlencode($sql_query) : '')
+                                                    . '&amp;goto=' . (isset($sql_goto) ? urlencode($lnk_goto) : '')
                                                     . '&amp;transform_key=' . urlencode($meta->name);