From 927ba37a766a6f3de7294668a16c574f46727dac Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Fri, 8 Nov 2013 19:21:49 +0100
Subject: [PATCH 1/2] Minor fix for uninitialized vars.

---
 libraries/DisplayResults.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 5a3c83ee06..95f13fae09 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -5426,18 +5426,18 @@ class PMA_DisplayResults
 
         $result = '[' . $category;
 
-        if (is_null($content)) {
-
-            $result .= ' - NULL';
-            $size = 0;
-
-        } elseif (isset($content)) {
+        if (isset($content)) {
 
             $size = strlen($content);
             $display_size
-                = PMA_Util::formatByteDown($size, 3, 1);
+                  = PMA_Util::formatByteDown($size, 3, 1);
             $result .= ' - '. $display_size[0] . ' ' . $display_size[1];
 
+        } else {
+
+            $result .= ' - NULL';
+            $size = 0;
+
         }
 
         $result .= ']';

From 7e1e6e5691f7507e69b73b36e9d7ebbf92e3cf8f Mon Sep 17 00:00:00 2001
From: Hugues Peccatte <hugues.peccatte@gmail.com>
Date: Mon, 11 Nov 2013 18:56:35 +0100
Subject: [PATCH 2/2] Add initialization of some variables and useless code.

---
 libraries/plugins/export/ExportOdt.class.php | 2 --
 libraries/plugins/import/ImportCsv.class.php | 1 +
 libraries/tbl_tracking.lib.php               | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php
index e2f35ff398..5df6f65279 100644
--- a/libraries/plugins/export/ExportOdt.class.php
+++ b/libraries/plugins/export/ExportOdt.class.php
@@ -717,8 +717,6 @@ class ExportOdt extends ExportPlugin
             } else {
                 $column['Default'] = '';
             }
-        } else {
-            $column['Default'] = $column['Default'];
         }
         $definition .= '<table:table-cell office:value-type="string">'
             . '<text:p>'
diff --git a/libraries/plugins/import/ImportCsv.class.php b/libraries/plugins/import/ImportCsv.class.php
index 2018507659..64e2eae85c 100644
--- a/libraries/plugins/import/ImportCsv.class.php
+++ b/libraries/plugins/import/ImportCsv.class.php
@@ -233,6 +233,7 @@ class ImportCsv extends AbstractImportCsv
         // Defaults for parser
         $i = 0;
         $len = 0;
+        $lastlen = null;
         $line = 1;
         $lasti = -1;
         $values = array();
diff --git a/libraries/tbl_tracking.lib.php b/libraries/tbl_tracking.lib.php
index 01f35c3ad8..c283683780 100644
--- a/libraries/tbl_tracking.lib.php
+++ b/libraries/tbl_tracking.lib.php
@@ -545,6 +545,8 @@ function PMA_getHtmlForDataManipulationStatement($entry, $filter_users,
     $statement  = PMA_Util::formatSql($entry['statement'], true);
     $timestamp = strtotime($entry['date']);
     $filtered_user = in_array($entry['username'], $filter_users);
+    $html = null;
+
     if ($timestamp >= $filter_ts_from
         && $timestamp <= $filter_ts_to
         && (in_array('*', $filter_users) || $filtered_user)
@@ -638,6 +640,8 @@ function PMA_getHtmlForDataDefinitionStatement($entry, $filter_users,
     $statement  = PMA_Util::formatSql($entry['statement'], true);
     $timestamp = strtotime($entry['date']);
     $filtered_user = in_array($entry['username'], $filter_users);
+    $html = null;
+
     if ($timestamp >= $filter_ts_from
         && $timestamp <= $filter_ts_to
         && (in_array('*', $filter_users) || $filtered_user)