bug #1444025, dead code about DOCUMENT_ROOT
This commit is contained in:
@@ -10,6 +10,7 @@ $Source$
|
|||||||
same display units
|
same display units
|
||||||
* lang/english*, /french*: use IEC binary units; use "B" for Bytes
|
* lang/english*, /french*: use IEC binary units; use "B" for Bytes
|
||||||
and "o" for "Octets" in French
|
and "o" for "Octets" in French
|
||||||
|
* db_details_importdocsql.php: bug #1444025, dead code about DOCUMENT_ROOT
|
||||||
|
|
||||||
2006-03-17 Marc Delisle <lem9@users.sourceforge.net>
|
2006-03-17 Marc Delisle <lem9@users.sourceforge.net>
|
||||||
* libraries/dbi/mysqli.dbi.lib.php: if $cfg['Servers'][$i]['nopassword']
|
* libraries/dbi/mysqli.dbi.lib.php: if $cfg['Servers'][$i]['nopassword']
|
||||||
|
@@ -118,22 +118,6 @@ if (isset($cfg['docSQLDir']) && !empty($cfg['docSQLDir'])) {
|
|||||||
} // end working on table
|
} // end working on table
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Try to get the "$DOCUMENT_ROOT" variable whatever is the register_globals
|
|
||||||
* value
|
|
||||||
*/
|
|
||||||
if (empty($DOCUMENT_ROOT)) {
|
|
||||||
if (!empty($_SERVER) && isset($_SERVER['DOCUMENT_ROOT'])) {
|
|
||||||
$DOCUMENT_ROOT = $_SERVER['DOCUMENT_ROOT'];
|
|
||||||
} elseif (!empty($_ENV) && isset($_ENV['DOCUMENT_ROOT'])) {
|
|
||||||
$DOCUMENT_ROOT = $_ENV['DOCUMENT_ROOT'];
|
|
||||||
} elseif (@getenv('DOCUMENT_ROOT')) {
|
|
||||||
$DOCUMENT_ROOT = getenv('DOCUMENT_ROOT');
|
|
||||||
} else {
|
|
||||||
$DOCUMENT_ROOT = '.';
|
|
||||||
}
|
|
||||||
} // end if
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes import if required
|
* Executes import if required
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user