diff options
author | Andreas Gohr <andi@splitbrain.org> | 2007-09-30 20:42:50 +0200 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2007-09-30 20:42:50 +0200 |
commit | 009768124df70258806ec3120189432d1b2bb912 (patch) | |
tree | cc66e19004645686d0bf84e71fa54f490e0ff4a7 /inc/cliopts.php | |
parent | 0b30864498cfa9af2398991188109da991e4613f (diff) | |
download | rpg-009768124df70258806ec3120189432d1b2bb912.tar.gz rpg-009768124df70258806ec3120189432d1b2bb912.tar.bz2 |
don't use realpath() anymore (FS#1261 and others)
The use of realpath() to clean up relative file names caused some
trouble in certain setups relying on symlinks or having restricitve
file structure setups.
This patch replaces all realpath() calls with a PHP only replacement
which should solve those problems.
darcs-hash:20070930184250-7ad00-512ff04c95f57fc9eaf104f80372237a3c94286f.gz
Diffstat (limited to 'inc/cliopts.php')
-rw-r--r-- | inc/cliopts.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/cliopts.php b/inc/cliopts.php index 06167b0bd..6ca8de748 100644 --- a/inc/cliopts.php +++ b/inc/cliopts.php @@ -20,7 +20,7 @@ // +----------------------------------------------------------------------+ // -if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/'); //------------------------------------------------------------------------------ /** @@ -86,7 +86,7 @@ define('DOKU_CLI_OPTS_ARG_READ',5);//Could not read argv } // Compatibility between "php extensions.php" and "./extensions.php" - if ( realpath($_SERVER['argv'][0]) == $bin_file ) { + if ( fullpath($_SERVER['argv'][0]) == $bin_file ) { $options = Doku_Cli_Opts::getOpt($args,$short_options,$long_options); } else { $options = Doku_Cli_Opts::getOpt2($args,$short_options,$long_options); |