From f64067e1e842810dfac7a5b4af98995324a56b47 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Mon, 7 Nov 2005 10:31:56 +0000
Subject: [PATCH] bug #985399 MIME-based in print view / need to select the pk

---
 ChangeLog                     |  4 ++++
 libraries/display_tbl.lib.php | 28 +++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b23fe557b..b214bdbc5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-06 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/display_tbl.lib.php:
+      bug #985399 MIME-based in print view / need to select the pk
+      
 2005-11-06 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/norwegian: Update, thanks to Sven-Erik Andersen
 
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 627bdda1e..5fc9b475c 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1066,23 +1066,21 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
             <?php
             echo "\n";
         }
-
+        
         // 1. Prepares the row (gets primary keys to use)
+        // 1.1 Results from a "SELECT" statement -> builds the
+        //     "primary" key to use in links
+        $uva_condition     = urlencode(PMA_getUvaCondition($dt_result, $fields_cnt, $fields_meta, $row));
+
+        // 1.2 Defines the urls for the modify/delete link(s)
+        $url_query  = PMA_generate_common_url($db, $table)
+                    . '&amp;pos=' . $pos
+                    . '&amp;session_max_rows=' . $session_max_rows
+                    . '&amp;disp_direction=' . $disp_direction
+                    . '&amp;repeat_cells=' . $repeat_cells
+                    . '&amp;dontlimitchars=' . $dontlimitchars;
+
         if ($is_display['edit_lnk'] != 'nn' || $is_display['del_lnk'] != 'nn') {
-            // 1.1 Results from a "SELECT" statement -> builds the
-            //     "primary" key to use in links
-            if ($is_display['edit_lnk'] == 'ur' /* || $is_display['edit_lnk'] == 'dr' */) {
-                $uva_condition     = urlencode(PMA_getUvaCondition($dt_result, $fields_cnt, $fields_meta, $row));
-            } // end if (1.1)
-
-            // 1.2 Defines the urls for the modify/delete link(s)
-            $url_query  = PMA_generate_common_url($db, $table)
-                        . '&amp;pos=' . $pos
-                        . '&amp;session_max_rows=' . $session_max_rows
-                        . '&amp;disp_direction=' . $disp_direction
-                        . '&amp;repeat_cells=' . $repeat_cells
-                        . '&amp;dontlimitchars=' . $dontlimitchars;
-
             // We need to copy the value or else the == 'both' check will always return true
             $propicon = (string)$GLOBALS['cfg']['PropertiesIconic'];