From 7d26b2074fe83bde7cbebf986e23f85e0c28f55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jere=20Vainionp=C3=A4=C3=A4?= <jermakovi@hotmail.fi>
Date: Sat, 8 Dec 2012 10:55:34 +0100
Subject: [PATCH 1/2] Translated using Weblate (Finnish)

Currently translated at 74.2% (1902 of 2562)
---
 po/fi.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/po/fi.po b/po/fi.po
index fbd044fbe7..6bd32dabf2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.4-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2012-10-16 14:37+0200\n"
-"PO-Revision-Date: 2012-12-07 17:38+0200\n"
-"Last-Translator: Ilkka Kiviharju <ilkka.kiviharju@gmail.com>\n"
+"PO-Revision-Date: 2012-12-08 10:55+0200\n"
+"Last-Translator: Jere Vainionpää <jermakovi@hotmail.fi>\n"
 "Language-Team: Finnish <http://l10n.cihar.com/projects/phpmyadmin/3-5/fi/>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -8538,7 +8538,7 @@ msgstr "Tietokanta käyttäjälle"
 
 #: main.php:172
 msgid "Software"
-msgstr ""
+msgstr "Ohjelmisto"
 
 #: main.php:173
 #, fuzzy

From 584c52820378b589198756cad240dda1bbe3710b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 12 Dec 2012 13:03:55 -0500
Subject: [PATCH 2/2] bug #3593534 [tracking] Structure Snapshot on tracked
 view renders invalid SQL

---
 ChangeLog        |  2 ++
 tbl_tracking.php | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bda0a8857..9bd0972489 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ phpMyAdmin - ChangeLog
 - bug #3588354 [l10n] Portuguese Language not displaying correctly
 - bug #3591412 [status] Live charts don't work for non-default server
 - bug [core] Proxy ajax calls to pma.net to avoid browser notices
+- bug #3593534 [tracking] Structure Snapshot on tracked view renders invalid
+SQL
 
 3.5.4.0 (2012-11-16)
 - bug #3570212 [edit] uuid_short() is a no-arguments function
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 38905d4eff..237037000b 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -169,7 +169,13 @@ if (isset($_REQUEST['submit_create_version'])) {
     }
     $tracking_set = rtrim($tracking_set, ',');
 
-    if (PMA_Tracker::createVersion($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set )) {
+    if (PMA_Tracker::createVersion(
+        $GLOBALS['db'], 
+        $GLOBALS['table'], 
+        $_REQUEST['version'], 
+        $tracking_set, 
+        PMA_Table::isView($GLOBALS['db'], $GLOBALS['table']))
+    ) {
         $msg = PMA_Message::success(sprintf(__('Version %s is created, tracking for %s.%s is activated.'), htmlspecialchars($_REQUEST['version']), htmlspecialchars($GLOBALS['db']), htmlspecialchars($GLOBALS['table'])));
         $msg->display();
     }
@@ -236,10 +242,11 @@ if (isset($_REQUEST['snapshot'])) {
 <?php
     $data = PMA_Tracker::getTrackedData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']);
 
-    // Get first DROP TABLE and CREATE TABLE statements
+    // Get first DROP TABLE/VIEW and CREATE TABLE/VIEW statements
     $drop_create_statements = $data['ddlog'][0]['statement'];
 
-    if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')) {
+    if (strstr($data['ddlog'][0]['statement'], 'DROP TABLE')
+        || strstr($data['ddlog'][0]['statement'], 'DROP VIEW')) {
         $drop_create_statements .= $data['ddlog'][1]['statement'];
     }
     // Print SQL code