Merge remote-tracking branch 'origin/master'

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

libraries/engines/bdb.lib.php

@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/berkeleydb.lib.php

@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * Load BDB class.
  */

libraries/engines/binlog.lib.php

@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  * @package PhpMyAdmin-Engines

libraries/engines/innobase.lib.php

@@ -8,10 +8,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  */

libraries/engines/innodb.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The InnoDB storage engine
  *

libraries/engines/memory.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MEMORY (HEAP) storage engine
  *

libraries/engines/merge.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MERGE storage engine
  *

libraries/engines/mrg_myisam.lib.php

@@ -7,10 +7,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  *
  */

libraries/engines/myisam.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The MyISAM storage engine
  *

libraries/engines/ndbcluster.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The NDBCLUSTER storage engine
  *

libraries/engines/pbxt.lib.php

@@ -9,10 +9,6 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-if (! defined('PHPMYADMIN')) {
-    exit;
-}
-
 /**
  * The PBXT storage engine
  *