diff options
| author | Dieter Adriaenssens <ruleant@users.sourceforge.net> | 2011-09-06 23:48:05 +0400 |
|---|---|---|
| committer | Dieter Adriaenssens <ruleant@users.sourceforge.net> | 2011-09-06 23:48:05 +0400 |
| commit | a30554b1e4e5a0b6a048b4dfe12dfbeb45321c37 (patch) | |
| tree | f0c7199483888c157df40fe35a04be851cf8ee3f | |
| parent | a1c9a65994630a28f76a08d86d498ef0493539eb (diff) | |
use require() instead of include() when including file unconditionally
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | libraries/engines/berkeleydb.lib.php | 2 | ||||
| -rw-r--r-- | libraries/engines/innobase.lib.php | 2 | ||||
| -rw-r--r-- | libraries/engines/mrg_myisam.lib.php | 2 | ||||
| -rw-r--r-- | libraries/schema/Dia_Relation_Schema.class.php | 2 | ||||
| -rw-r--r-- | libraries/schema/Eps_Relation_Schema.class.php | 2 | ||||
| -rw-r--r-- | pmd_display_field.php | 2 | ||||
| -rw-r--r-- | pmd_pdf.php | 2 | ||||
| -rw-r--r-- | pmd_relation_new.php | 4 | ||||
| -rw-r--r-- | pmd_relation_upd.php | 4 | ||||
| -rw-r--r-- | pmd_save_pos.php | 2 | ||||
| -rw-r--r-- | schema_export.php | 4 |
12 files changed, 15 insertions, 15 deletions
@@ -69,7 +69,7 @@ $lang_iso_code = $GLOBALS['available_languages'][$GLOBALS['lang']][1]; // 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 index 48b2ae8896..b112e2999b 100644 --- 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 index e1262b9c92..f6269757b2 100644 --- 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 index fd25178bae..808f33a4b2 100644 --- 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 index 11c03ec5bb..bf34de0554 100644 --- 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 index ffb117efff..983879f429 100644 --- 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 index 9f8291200e..f7665b89c8 100644 --- 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 index 2afe131a66..f8102dae1d 100644 --- 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 index 8566d2dac4..a171658661 100644 --- 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 index 7151cf7563..29bc68832b 100644 --- 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 index 1a071aff8c..ac7d53366a 100644 --- 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 index 30384e861e..e566c7c416 100644 --- a/schema_export.php +++ b/schema_export.php @@ -21,7 +21,7 @@ $cfgRelation = PMA_getRelationsParam(); 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 @@ $path = PMA_securePath(ucfirst($export_type)); 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();"); |