Move common includes to root files rather than to library (which shou…

…ld not be lodaded separately) (issue #36)
phpmyadmin · Apr 17, 2012 · c8b6865 · c8b6865
1 parent e80e5c5
commit c8b6865
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
@@ -6,8 +6,6 @@
 /**
  *
  */
-require_once './libraries/common.inc.php';
-
 if (! defined('PHPMYADMIN')) {
     exit;
 }

diff --git a/pmd_display_field.php b/pmd_display_field.php
@@ -7,6 +7,8 @@
 /**
  *
  */
+require_once './libraries/common.inc.php';
+
 require_once 'libraries/pmd_common.php';
 
 

diff --git a/pmd_general.php b/pmd_general.php
@@ -7,6 +7,7 @@
 /**
  *
  */
+require_once './libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 require 'libraries/db_common.inc.php';
 require 'libraries/db_info.inc.php';

diff --git a/pmd_pdf.php b/pmd_pdf.php
@@ -5,6 +5,7 @@
  * @package PhpMyAdmin-Designer
  */
 
+require_once './libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 
 /**

diff --git a/pmd_relation_new.php b/pmd_relation_new.php
@@ -8,6 +8,7 @@
 /**
  *
  */
+require_once './libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 $die_save_pos = 0;
 require_once 'pmd_save_pos.php';

diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
@@ -8,6 +8,7 @@
 /**
  *
  */
+require_once './libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 extract($_POST, EXTR_SKIP);
 extract($_GET, EXTR_SKIP);

diff --git a/pmd_save_pos.php b/pmd_save_pos.php
@@ -8,6 +8,7 @@
 /**
  *
  */
+require_once './libraries/common.inc.php';
 require_once 'libraries/pmd_common.php';
 
 $cfgRelation = PMA_getRelationsParam();