mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 06:18:52 +00:00
remove one problematic instance from the realpath replacement
git-svn-id: file:///svn/phpbb/trunk@8129 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
eca02ecbf3
commit
303239afa4
1 changed files with 167 additions and 177 deletions
|
@ -8,6 +8,14 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @ignore
|
||||||
|
*/
|
||||||
|
if (!defined('IN_PHPBB'))
|
||||||
|
{
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
// Common global functions
|
// Common global functions
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -471,23 +479,6 @@ if (!function_exists('stripos'))
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!function_exists('realpath'))
|
if (!function_exists('realpath'))
|
||||||
{
|
|
||||||
if (DIRECTORY_SEPARATOR != '\\' && !(bool) ini_get('safe_mode') && function_exists('shell_exec') && trim(`realpath .`))
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @author Chris Smith <chris@project-minerva.org>
|
|
||||||
* @copyright 2006 Project Minerva Team
|
|
||||||
* @param string $path The path which we should attempt to resolve.
|
|
||||||
* @return mixed
|
|
||||||
* @ignore
|
|
||||||
*/
|
|
||||||
function phpbb_realpath($path)
|
|
||||||
{
|
|
||||||
$arg = escapeshellarg($path);
|
|
||||||
return trim(`realpath '$arg'`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Checks if a path ($path) is absolute or relative
|
* Checks if a path ($path) is absolute or relative
|
||||||
|
@ -651,7 +642,6 @@ if (!function_exists('realpath'))
|
||||||
return $resolved; // We got here, in the end!
|
return $resolved; // We got here, in the end!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue