From bebe981371131d8a8694fda254098197ab42de73 Mon Sep 17 00:00:00 2001
From: FliegenKLATSCH <chris@koras.de>
Date: Sun, 4 Aug 2013 18:20:48 +0200
Subject: [PATCH 1/2] Version-Parameter fixed

Single Tracking-Entries couldn't be deleted because of missing Version in the Delete-Link.
---
 tbl_tracking.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tbl_tracking.php b/tbl_tracking.php
index c1ae531dac..f17c67bffb 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -585,7 +585,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                 echo '<td>' . $statement . '</td>';
                 echo '<td class="nowrap"><a href="tbl_tracking.php?'
                     . $url_query . '&amp;report=true&amp;version='
-                    . $version['version'] . '&amp;delete_ddlog='
+                    . $_REQUEST['version'] . '&amp;delete_ddlog='
                     . ($i - 1) . '">' . $drop_image_or_text
                     . '</a></td>';
                 echo '</tr>';
@@ -646,7 +646,7 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                 echo '<td><small>' . htmlspecialchars($entry['username']) . '</small></td>';
                 echo '<td>' . $statement . '</td>';
                 echo '<td class="nowrap"><a href="tbl_tracking.php?' . $url_query
-                    . '&amp;report=true&amp;version=' . $version['version']
+                    . '&amp;report=true&amp;version=' . $_REQUEST['version']
                     . '&amp;delete_dmlog=' . ($i - $ddlog_count) . '">'
                     . $drop_image_or_text
                     . '</a></td>';

From 3a6d29f1831cb0afd71f0567d4ac2d8451bdf800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 5 Aug 2013 10:00:39 +0200
Subject: [PATCH 2/2] Use PMA_generate_common_url for URL parameters

---
 tbl_tracking.php | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tbl_tracking.php b/tbl_tracking.php
index f17c67bffb..69620ec2f0 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -584,9 +584,14 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                 echo '<td><small>' . htmlspecialchars($entry['username']) . '</small></td>';
                 echo '<td>' . $statement . '</td>';
                 echo '<td class="nowrap"><a href="tbl_tracking.php?'
-                    . $url_query . '&amp;report=true&amp;version='
-                    . $_REQUEST['version'] . '&amp;delete_ddlog='
-                    . ($i - 1) . '">' . $drop_image_or_text
+                    . PMA_generate_common_url(
+                        $url_params + array(
+                            'report' => 'true',
+                            'version' => $_REQUEST['version'],
+                            'delete_ddlog' => ($i - 1),
+                        )
+                    )
+                    . '">' . $drop_image_or_text
                     . '</a></td>';
                 echo '</tr>';
 
@@ -645,9 +650,15 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
                 echo '<td><small>' . htmlspecialchars($entry['date']) . '</small></td>';
                 echo '<td><small>' . htmlspecialchars($entry['username']) . '</small></td>';
                 echo '<td>' . $statement . '</td>';
-                echo '<td class="nowrap"><a href="tbl_tracking.php?' . $url_query
-                    . '&amp;report=true&amp;version=' . $_REQUEST['version']
-                    . '&amp;delete_dmlog=' . ($i - $ddlog_count) . '">'
+                echo '<td class="nowrap"><a href="tbl_tracking.php?'
+                    . PMA_generate_common_url(
+                        $url_params + array(
+                            'report' => 'true',
+                            'version' => $_REQUEST['version'],
+                            'delete_dmlog' => ($i - $ddlog_count),
+                        )
+                    )
+                    . '">'
                     . $drop_image_or_text
                     . '</a></td>';
                 echo '</tr>';