From ae88c8daadc79ea94b69f1833874de441dc7b21a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=AE=95=E0=AE=A3=E0=AF=87=E0=AE=B7=E0=AF=8D=20=E0=AE=95?=
 =?UTF-8?q?=E0=AF=81=E0=AE=AE=E0=AE=BE=E0=AE=B0=E0=AF=8D?=
 <GANESHTHEONE@gmail.com>
Date: Thu, 21 Aug 2014 22:36:12 +0200
Subject: [PATCH 1/2] Translated using Weblate (Tamil)

Currently translated at 37.3% (1033 of 2768)

[ci skip]
---
 po/ta.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ta.po b/po/ta.po
index 4fbd4b09b9..7cb0b221fb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-07-08 07:11-0400\n"
-"PO-Revision-Date: 2014-08-11 23:32+0200\n"
+"PO-Revision-Date: 2014-08-21 22:36+0200\n"
 "Last-Translator: கணேஷ் குமார் <GANESHTHEONE@gmail.com>\n"
 "Language-Team: Tamil <https://l10n.cihar.com/projects/phpmyadmin/4-2/ta/>\n"
 "Language: ta\n"
@@ -5878,7 +5878,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:597
 msgid "Hide databases matching regular expression (PCRE)."
-msgstr ""
+msgstr "சுருங்குறிக்கு பொருந்தும் தரவுத்தளங்களை மறைக்க (PCRE)."
 
 #: libraries/config/messages.inc.php:598
 msgid "Hide databases"

From 2e37de57ca68740d2ee25fd6340ecfe88b63d995 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 26 Aug 2014 07:54:38 -0400
Subject: [PATCH 2/2] Fix undefined variable notice; fix parameter type

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 libraries/tbl_relation.lib.php | 16 ++++++++--------
 tbl_relation.php               |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/tbl_relation.lib.php b/libraries/tbl_relation.lib.php
index 60b020ed47..bc9bfe9243 100644
--- a/libraries/tbl_relation.lib.php
+++ b/libraries/tbl_relation.lib.php
@@ -159,14 +159,14 @@ function PMA_generateRelationalDropdown(
 /**
  * Function to get html for the common form
  *
- * @param string $db                 current database
- * @param string $table              current table
- * @param array  $columns            columns
- * @param array  $cfgRelation        configuration relation
- * @param string $tbl_storage_engine table storage engine
- * @param array  $existrel           db, table, column
- * @param array  $existrel_foreign   db, table, column
- * @param array  $options_array      options array
+ * @param string     $db                 current database
+ * @param string     $table              current table
+ * @param array      $columns            columns
+ * @param array      $cfgRelation        configuration relation
+ * @param string     $tbl_storage_engine table storage engine
+ * @param array|null $existrel           db, table, column
+ * @param array|null $existrel_foreign   db, table, column
+ * @param array      $options_array      options array
  *
  * @return string
  */
diff --git a/tbl_relation.php b/tbl_relation.php
index 9be5f6260c..e8af9d5407 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -148,7 +148,8 @@ $columns = $GLOBALS['dbi']->getColumns($db, $table);
 
 // common form
 $html_output .= PMA_getHtmlForCommonForm(
-    $db, $table, $columns, $cfgRelation, $tbl_storage_engine, $existrel,
+    $db, $table, $columns, $cfgRelation, $tbl_storage_engine,
+    isset($existrel) ? $existrel : null,
     isset($existrel_foreign) ? $existrel_foreign : null, $options_array
 );