summaryrefslogtreecommitdiff
path: root/inc/parser.php
diff options
context:
space:
mode:
authorandi <andi@splitbrain.org>2005-02-19 11:20:55 +0100
committerandi <andi@splitbrain.org>2005-02-19 11:20:55 +0100
commited7b5f0908941f1bacef7e7c3a02c106a42cd5cc (patch)
tree6582419f82a87837adaefee934e1cb2a5316d8cb /inc/parser.php
parentf840b65d632cd5e155f4d6e39c8a42ae9fd5f566 (diff)
downloadrpg-ed7b5f0908941f1bacef7e7c3a02c106a42cd5cc.tar.gz
rpg-ed7b5f0908941f1bacef7e7c3a02c106a42cd5cc.tar.bz2
added init.php - may have broken something! (related to #153)
darcs-hash:20050219102055-9977f-575d654e742934c911ffab855d82aa91f198b5cf.gz
Diffstat (limited to 'inc/parser.php')
-rw-r--r--inc/parser.php15
1 files changed, 8 insertions, 7 deletions
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 @@
-<?
+<?php
/**
* The DokuWiki parser
*
@@ -6,11 +6,12 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
- 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] = '<img src="'.getBaseURL().'smileys/'.$sm[1].'" align="middle" alt="'.$sm[0].'" />';
+ $sm[1] = '<img src="'.DOKU_BASE.'smileys/'.$sm[1].'" align="middle" alt="'.$sm[0].'" />';
$sm[0] = preg_quote($sm[0],'/');
firstpass($table,$text,'/(\W)'.$sm[0].'(\W)/s',$sm[1],"\\1","\\2");
}