use require() instead of include() when including file unconditionally

phpmyadmin · Sep 6, 2011 · a30554b · a30554b
1 parent a1c9a65
commit a30554b
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/index.php b/index.php
@@ -69,7 +69,7 @@
 
 
 // start output
-include './libraries/header_http.inc.php';
+require './libraries/header_http.inc.php';
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">

diff --git a/libraries/engines/berkeleydb.lib.php b/libraries/engines/berkeleydb.lib.php
@@ -7,7 +7,7 @@
 /**
  * Load BDB class.
  */
-include_once './libraries/engines/bdb.lib.php';
+require_once './libraries/engines/bdb.lib.php';
 
 /**
  * This is same as BDB.

diff --git a/libraries/engines/innobase.lib.php b/libraries/engines/innobase.lib.php
@@ -8,7 +8,7 @@
 /**
  *
  */
-include_once './libraries/engines/innodb.lib.php';
+require_once './libraries/engines/innodb.lib.php';
 
 /**
  *

diff --git a/libraries/engines/mrg_myisam.lib.php b/libraries/engines/mrg_myisam.lib.php
@@ -7,7 +7,7 @@
 /**
  *
  */
-include_once './libraries/engines/merge.lib.php';
+require_once './libraries/engines/merge.lib.php';
 
 /**
  *

diff --git a/libraries/schema/Dia_Relation_Schema.class.php b/libraries/schema/Dia_Relation_Schema.class.php
@@ -5,7 +5,7 @@
  * @package phpMyAdmin
  */
 
-include_once "Export_Relation_Schema.class.php";
+require_once "Export_Relation_Schema.class.php";
 
 /**
  * This Class inherits the XMLwriter class and

diff --git a/libraries/schema/Eps_Relation_Schema.class.php b/libraries/schema/Eps_Relation_Schema.class.php
@@ -5,7 +5,7 @@
  * @package phpMyAdmin
  */
 
-include_once "Export_Relation_Schema.class.php";
+require_once "Export_Relation_Schema.class.php";
 
 /**
  * This Class is EPS Library and

diff --git a/pmd_display_field.php b/pmd_display_field.php
@@ -7,7 +7,7 @@
 /**
  *
  */
-include_once './libraries/pmd_common.php';
+require_once './libraries/pmd_common.php';
 
 
 $table = $T;

diff --git a/pmd_pdf.php b/pmd_pdf.php
@@ -5,7 +5,7 @@
  * @package phpMyAdmin-Designer
  */
 
-include_once './libraries/pmd_common.php';
+require_once './libraries/pmd_common.php';
 
 /**
  * If called directly from the designer, first save the positions

diff --git a/pmd_relation_new.php b/pmd_relation_new.php
@@ -8,9 +8,9 @@
 /**
  *
  */
-include_once './libraries/pmd_common.php';
+require_once './libraries/pmd_common.php';
 $die_save_pos = 0;
-include_once 'pmd_save_pos.php';
+require_once 'pmd_save_pos.php';
 extract($_POST, EXTR_SKIP);
 
 $tables = PMA_DBI_get_tables_full($db, $T1);

diff --git a/pmd_relation_upd.php b/pmd_relation_upd.php
@@ -8,11 +8,11 @@
 /**
  *
  */
-include_once './libraries/pmd_common.php';
+require_once './libraries/pmd_common.php';
 extract($_POST, EXTR_SKIP);
 extract($_GET, EXTR_SKIP);
 $die_save_pos = 0;
-include_once 'pmd_save_pos.php';
+require_once 'pmd_save_pos.php';
 list($DB1,$T1) = explode(".",$T1);
 list($DB2,$T2) = explode(".",$T2);
 

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

diff --git a/schema_export.php b/schema_export.php
@@ -21,7 +21,7 @@
 
 require_once './libraries/transformations.lib.php';
 require_once './libraries/Index.class.php';
-include_once "./libraries/schema/Export_Relation_Schema.class.php";
+require_once "./libraries/schema/Export_Relation_Schema.class.php";
 
 /**
  * get all the export options and verify
@@ -38,5 +38,5 @@
 if (!file_exists('./libraries/schema/' . $path . '_Relation_Schema.class.php')) {
     PMA_Export_Relation_Schema::dieSchema($_POST['chpage'],$export_type,__('File doesn\'t exist'));
 }
-include "./libraries/schema/".$path."_Relation_Schema.class.php";
+require "./libraries/schema/".$path."_Relation_Schema.class.php";
 $obj_schema = eval("new PMA_".$path."_Relation_Schema();");