Skip to content

Commit

Permalink
removed deprecated support for style.local.ini
Browse files Browse the repository at this point in the history
use conf/tpl/<template-folder-name>/style.ini instead
  • Loading branch information
selfthinker committed Jul 31, 2015
1 parent 767d166 commit 656e584
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions lib/exe/css.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ function css_out(){
$tplinc = tpl_incdir($tpl);
$cache_files = getConfigFiles('main');
$cache_files[] = $tplinc.'style.ini';
$cache_files[] = $tplinc.'style.local.ini'; // @deprecated
$cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
$cache_files[] = __FILE__;
if($INPUT->bool('preview')) $cache_files[] = $conf['cachedir'].'/preview.ini';
Expand Down Expand Up @@ -289,23 +288,6 @@ function css_styleini($tpl, $preview=false) {
}
}

// load template's style.local.ini
// @deprecated 2013-08-03
$ini = $incbase.'style.local.ini';
if(file_exists($ini)){
$data = parse_ini_file($ini, true);

// stylesheets
if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
$stylesheets[$mode][$incbase.$file] = $webbase;
}

// replacements
if(is_array($data['replacements'])){
$replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
}
}

// load configs's style.ini
$webbase = DOKU_BASE;
$ini = DOKU_CONF."tpl/$tpl/style.ini";
Expand Down

0 comments on commit 656e584

Please sign in to comment.