From ed7b5f0908941f1bacef7e7c3a02c106a42cd5cc Mon Sep 17 00:00:00 2001 From: andi Date: Sat, 19 Feb 2005 11:20:55 +0100 Subject: added init.php - may have broken something! (related to #153) darcs-hash:20050219102055-9977f-575d654e742934c911ffab855d82aa91f198b5cf.gz --- inc/parser.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'inc/parser.php') diff --git a/inc/parser.php b/inc/parser.php index 73bbee765..5c3c78851 100644 --- a/inc/parser.php +++ b/inc/parser.php @@ -1,4 +1,4 @@ - */ - include_once("inc/common.php"); - include_once("inc/html.php"); - include_once("inc/format.php"); - require_once("lang/en/lang.php"); - require_once("lang/".$conf['lang']."/lang.php"); + if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); + include_once(DOKU_INC.'inc/common.php'); + include_once(DOKU_INC.'inc/html.php'); + include_once(DOKU_INC.'inc/format.php'); + require_once(DOKU_INC.'lang/en/lang.php'); + require_once(DOKU_INC.'lang/'.$conf['lang'].'/lang.php'); /** * The main parser function. @@ -469,7 +470,7 @@ function smileys(&$table,&$text){ $smiley = trim($smiley); if(empty($smiley)) continue; $sm = preg_split('/\s+/',$smiley,2); - $sm[1] = ''.$sm[0].''; + $sm[1] = ''.$sm[0].''; $sm[0] = preg_quote($sm[0],'/'); firstpass($table,$text,'/(\W)'.$sm[0].'(\W)/s',$sm[1],"\\1","\\2"); } -- cgit v1.2.3