From 639dc7fcf67b1277f6a0ee4d707d90daefbb975e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 26 Jul 2010 16:46:37 +0200 Subject: [PATCH] Simplify inclusions of vendor_config. --- libraries/Config.class.php | 2 +- setup/lib/config_info.inc.php | 5 ----- setup/lib/index.lib.php | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 225977bef..7389b9f76 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -9,7 +9,7 @@ /** * Load vendor configuration. */ -require_once('./libraries/vendor_config.php'); +require('./libraries/vendor_config.php'); /** * Configuration class diff --git a/setup/lib/config_info.inc.php b/setup/lib/config_info.inc.php index afc124ac6..b48cb5d47 100644 --- a/setup/lib/config_info.inc.php +++ b/setup/lib/config_info.inc.php @@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) { exit; } -/** - * Load paths. - */ -require_once('./libraries/vendor_config.php'); - $cfg_db = array(); // path to config file, relative to phpMyAdmin's root path diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php index 8cb2ed1c2..115cc9fd6 100644 --- a/setup/lib/index.lib.php +++ b/setup/lib/index.lib.php @@ -15,11 +15,6 @@ if (!defined('PHPMYADMIN')) { exit; } -/** - * Load vendor config. - */ -require_once('./libraries/vendor_config.php'); - /** * Initializes message list */