From e6e78a1fa450674f784b7d03d31793d7384913cd Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 31 Jul 2010 15:06:28 -0400
Subject: [PATCH 1/2] incorrect HTML entity

---
 lang/german-utf-8.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index bf32f9f19..52c7ff6df 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -290,7 +290,7 @@ $strEditPDFPages = 'PDF-Seiten bearbeiten';
 $strEditPrivileges = 'Rechte ändern';
 $strEffective = 'Effektiv';
 $strEmpty = 'Leeren';
-$strEmptyResultSet = 'MySQL lieferte ein leeres Resultat zurück (d.&nbsp;h. null Zeilen).';
+$strEmptyResultSet = 'MySQL lieferte ein leeres Resultat zurück (d.h. null Zeilen).';
 $strEnabled = 'Aktiviert';
 $strEncloseInTransaction = 'Export in einer Transaktion zusammenfassen';
 $strEndCut = 'AUSSCHNITTSENDE';

From fd1d214d35270f881ae4a12555b1a0f467e2381a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 1 Aug 2010 06:17:03 -0400
Subject: [PATCH 2/2] bug #3036132 [core] Triggers not fetched if dbname has an
 hyphen

---
 ChangeLog                            | 1 +
 libraries/database_interface.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 348234805..b5704473c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #3031705 [core] Fix generating condition for real numbers by comparing
   them to string.
 - bug #3034026 [confirmation] TRUNCATE queries get no confirmation request
+- bug #3036132 [core] Triggers not fetched if dbname has an hyphen
 
 3.3.5.0 (2010-07-26)
 - patch #2932113 [information_schema] Slow export when having lots of
diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index a7d9e72bb..501c34d0c 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -1401,7 +1401,7 @@ function PMA_DBI_get_triggers($db, $table, $delimiter = '//')
     // instead of WHERE EVENT_OBJECT_SCHEMA='dbname'
         $triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE TRIGGER_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';");
     } else {
-        $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_sqlAddslashes($db,true) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';");
+        $triggers = PMA_DBI_fetch_result("SHOW TRIGGERS FROM " . PMA_backquote(PMA_sqlAddslashes($db,true)) . " LIKE '" . PMA_sqlAddslashes($table, true) . "';");
     }
 
     if ($triggers) {