[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5953-g639dc7f

[Michal Čihař]

The branch, master has been updated
       via  639dc7fcf67b1277f6a0ee4d707d90daefbb975e (commit)
       via  f700a73c81668adcc59d0ccc24ca89ab87bd3663 (commit)
      from  ebc3f1b3c6a8966fbaee4f6880319d7920ec31dd (commit)


- Log -----------------------------------------------------------------
commit 639dc7fcf67b1277f6a0ee4d707d90daefbb975e
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Jul 26 16:46:37 2010 +0200

    Simplify inclusions of vendor_config.

commit f700a73c81668adcc59d0ccc24ca89ab87bd3663
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Jul 26 16:44:47 2010 +0200

    No need for require_once in these files.

-----------------------------------------------------------------------

Summary of changes:
 libraries/Config.class.php    |    2 +-
 setup/lib/config_info.inc.php |    5 -----
 setup/lib/index.lib.php       |    5 -----
 themes.php                    |    4 ++--
 webapp.php                    |    4 ++--
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 225977b..7389b9f 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 afc124a..b48cb5d 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 8cb2ed1..115cc9f 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -16,11 +16,6 @@ if (!defined('PHPMYADMIN')) {
 }
 
 /**
- * Load vendor config.
- */
-require_once('./libraries/vendor_config.php');
-
-/**
  * Initializes message list
  */
 function messages_begin()
diff --git a/themes.php b/themes.php
index a996030..e58933f 100644
--- a/themes.php
+++ b/themes.php
@@ -8,13 +8,13 @@
 /**
  * get some globals
  */
-require_once './libraries/common.inc.php';
+require './libraries/common.inc.php';
 
 /* Theme Select */
 $path_to_themes = $cfg['ThemePath'] . '/';
 
 /* set language and charset */
-require_once './libraries/header_http.inc.php';
+require './libraries/header_http.inc.php';
 
 /* HTML header */
 $page_title = 'phpMyAdmin - ' . __('Theme / Style');
diff --git a/webapp.php b/webapp.php
index 1bae366..86d6bf1 100644
--- a/webapp.php
+++ b/webapp.php
@@ -13,11 +13,11 @@ define('PMA_MINIMUM_COMMON', true);
 /**
  * Gets core libraries and defines some variables
  */
-require_once './libraries/common.inc.php';
+require './libraries/common.inc.php';
 /**
  * ZIP file handler.
  */
-require_once './libraries/zip.lib.php';
+require './libraries/zip.lib.php';
 
 // ini file
 $parameters = array(


hooks/post-receive
-- 
phpMyAdmin