From 28b669a1aa3f7abe09e831f2c0d8c2c2f38c2339 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 30 Jul 2013 17:46:15 +0530
Subject: [PATCH 1/2] Remove redundant checks

---
 libraries/engines/bdb.lib.php        | 4 ----
 libraries/engines/berkeleydb.lib.php | 4 ----
 libraries/engines/binlog.lib.php     | 4 ----
 libraries/engines/innobase.lib.php   | 4 ----
 libraries/engines/innodb.lib.php     | 4 ----
 libraries/engines/memory.lib.php     | 4 ----
 libraries/engines/merge.lib.php      | 4 ----
 libraries/engines/mrg_myisam.lib.php | 4 ----
 libraries/engines/myisam.lib.php     | 4 ----
 libraries/engines/ndbcluster.lib.php | 4 ----
 libraries/engines/pbxt.lib.php       | 4 ----
 11 files changed, 44 deletions(-)

diff --git a/libraries/engines/bdb.lib.php b/libraries/engines/bdb.lib.php
index 3e1e9f912c..91a56bb57f 100644
--- a/libraries/engines/bdb.lib.php
+++ b/libraries/engines/bdb.lib.php
@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  * @package PhpMyAdmin-Engines
diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
index 52f6280978..d5324b1acd 100644
--- a/libraries/engines/berkeleydb.lib.php
+++ b/libraries/engines/berkeleydb.lib.php
@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Load BDB class.
  */
diff --git a/libraries/engines/binlog.lib.php b/libraries/engines/binlog.lib.php
index e6a4df0eb9..ea81738967 100644
--- a/libraries/engines/binlog.lib.php
+++ b/libraries/engines/binlog.lib.php
@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  * @package PhpMyAdmin-Engines
diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
index 9c95a8ece7..f81ae3f3b9 100644
--- a/libraries/engines/innobase.lib.php
+++ b/libraries/engines/innobase.lib.php
@@ -8,10 +8,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  */
diff --git a/libraries/engines/innodb.lib.php b/libraries/engines/innodb.lib.php
index 04d70a44ef..c7b639b25a 100644
--- a/libraries/engines/innodb.lib.php
+++ b/libraries/engines/innodb.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The InnoDB storage engine
  *
diff --git a/libraries/engines/memory.lib.php b/libraries/engines/memory.lib.php
index 819b9c0663..8e9fe5fc88 100644
--- a/libraries/engines/memory.lib.php
+++ b/libraries/engines/memory.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MEMORY (HEAP) storage engine
  *
diff --git a/libraries/engines/merge.lib.php b/libraries/engines/merge.lib.php
index 22d6a759dd..4bccfc79ca 100644
--- a/libraries/engines/merge.lib.php
+++ b/libraries/engines/merge.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *
diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
index eadccd0578..d3425365c2 100644
--- a/libraries/engines/mrg_myisam.lib.php
+++ b/libraries/engines/mrg_myisam.lib.php
@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  */
diff --git a/libraries/engines/myisam.lib.php b/libraries/engines/myisam.lib.php
index 456bf294c3..5882824bc4 100644
--- a/libraries/engines/myisam.lib.php
+++ b/libraries/engines/myisam.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MyISAM storage engine
  *
diff --git a/libraries/engines/ndbcluster.lib.php b/libraries/engines/ndbcluster.lib.php
index 74d2b2b953..e57846b601 100644
--- a/libraries/engines/ndbcluster.lib.php
+++ b/libraries/engines/ndbcluster.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The NDBCLUSTER storage engine
  *
diff --git a/libraries/engines/pbxt.lib.php b/libraries/engines/pbxt.lib.php
index 180279b090..fc4e343f5e 100644
--- a/libraries/engines/pbxt.lib.php
+++ b/libraries/engines/pbxt.lib.php
@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The PBXT storage engine
  *

From 4f93739fc5b25ebdc4bd2f054f14ae72f320ec82 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 30 Jul 2013 17:46:35 +0530
Subject: [PATCH 2/2] Fix typo

---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dd4b1007be..9373a4bbdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,7 +29,7 @@ phpMyAdmin - ChangeLog
 - bug #4024 Editing field a record is selected by makes pma load forever
 - bug #4035 Query "inline" link disappears when turning off "Explain SQL" option
 + rfe #1385 Hide tables, functions, procedures, events and views in navigation tree
-- rfe #1321 Export view as if it was a table
++ rfe #1321 Export view as if it was a table
 
 4.0.5.0 (not yet released)
 - bug #3977 Not detected configuration storage