Skip to content
Browse files

removed some more occurances of DOKU_TPL*

  • Loading branch information...
1 parent c4dda6a commit 81aca18e6e88c08386c11592dbf4650114aba04f @splitbrain committed Feb 1, 2012
Showing with 6 additions and 6 deletions.
  1. +2 −2 lib/exe/css.php
  2. +2 −2 lib/exe/js.php
  3. +2 −2 lib/exe/opensearch.php
View
4 lib/exe/css.php
@@ -41,8 +41,8 @@ function css_out(){
$tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
$tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
}else{
- $tplinc = DOKU_TPLINC;
- $tpldir = DOKU_TPL;
+ $tplinc = tpl_incdir();
+ $tpldir = tpl_basedir();
}
// The generated script depends on some dynamic options
View
4 lib/exe/js.php
@@ -65,7 +65,7 @@ function js_out(){
# disabled for FS#1958 DOKU_INC.'lib/scripts/hotkeys.js',
DOKU_INC.'lib/scripts/behaviour.js',
DOKU_INC.'lib/scripts/page.js',
- DOKU_TPLINC.'script.js',
+ tpl_incdir().'script.js',
);
// add possible plugin scripts and userscript
@@ -87,7 +87,7 @@ function js_out(){
// add some global variables
print "var DOKU_BASE = '".DOKU_BASE."';";
- print "var DOKU_TPL = '".DOKU_TPL."';";
+ print "var DOKU_TPL = '".tpl_basedir()."';";
// FIXME: Move those to JSINFO
print "var DOKU_UHN = ".((int) useHeading('navigation')).";";
print "var DOKU_UHC = ".((int) useHeading('content')).";";
View
4 lib/exe/opensearch.php
@@ -16,9 +16,9 @@
// try to be clever about the favicon location
if(file_exists(DOKU_INC.'favicon.ico')){
$ico = DOKU_URL.'favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){
+}elseif(file_exists(tpl_incdir().'images/favicon.ico')){
$ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
-}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){
+}elseif(file_exists(tpl_incdir().'favicon.ico')){
$ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
}else{
$ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';

0 comments on commit 81aca18

Please sign in to comment.
Something went wrong with that request. Please try again.