From 009768124df70258806ec3120189432d1b2bb912 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Sun, 30 Sep 2007 20:42:50 +0200
Subject: 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
---
 inc/parser/handler.php      | 2 +-
 inc/parser/lexer.php        | 2 +-
 inc/parser/metadata.php     | 2 +-
 inc/parser/parser.php       | 2 +-
 inc/parser/renderer.php     | 2 +-
 inc/parser/xhtml.php        | 2 +-
 inc/parser/xhtmlsummary.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'inc/parser')

diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 9716bd74f..740ccea04 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1,5 +1,5 @@
 <?php
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 class Doku_Handler {
 
diff --git a/inc/parser/lexer.php b/inc/parser/lexer.php
index 2175e6786..0887dde93 100644
--- a/inc/parser/lexer.php
+++ b/inc/parser/lexer.php
@@ -13,7 +13,7 @@
 /**
 * Init path constant
 */
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 /**#@+
  * lexer mode constant
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 20a37ff18..f3cea82cd 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -5,7 +5,7 @@
  * @author Esther Brunner <wikidesign@gmail.com>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 if ( !defined('DOKU_LF') ) {
     // Some whitespace to help View > Source
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 849c6f0ea..89ce4313d 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -1,6 +1,6 @@
 <?php
 
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 require_once DOKU_INC . 'inc/parser/lexer.php';
 require_once DOKU_INC . 'inc/parser/handler.php';
diff --git a/inc/parser/renderer.php b/inc/parser/renderer.php
index dd4974f0d..aa4da9dc1 100644
--- a/inc/parser/renderer.php
+++ b/inc/parser/renderer.php
@@ -5,7 +5,7 @@
  * @author Harry Fuecks <hfuecks@gmail.com>
  * @author Andreas Gohr <andi@splitbrain.org>
  */
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 require_once DOKU_INC . 'inc/parser/renderer.php';
 require_once DOKU_INC . 'inc/plugin.php';
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 7279844f9..7b3e0cf9b 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -6,7 +6,7 @@
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 if ( !defined('DOKU_LF') ) {
     // Some whitespace to help View > Source
diff --git a/inc/parser/xhtmlsummary.php b/inc/parser/xhtmlsummary.php
index b82c564ed..2992b2a23 100644
--- a/inc/parser/xhtmlsummary.php
+++ b/inc/parser/xhtmlsummary.php
@@ -1,5 +1,5 @@
 <?php
-if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../../').'/');
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../../').'/');
 
 require_once DOKU_INC . 'inc/parser/xhtml.php';
 
-- 
cgit v1.2.3