From 656e58456ff0e79ba9cdcbffc1e23c89d43c123c Mon Sep 17 00:00:00 2001
From: Anika Henke <anika@selfthinker.org>
Date: Fri, 31 Jul 2015 10:35:23 +0100
Subject: [PATCH] removed deprecated support for style.local.ini
use conf/tpl/<template-folder-name>/style.ini instead
---
lib/exe/css.php | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/lib/exe/css.php b/lib/exe/css.php
index 3b8a524bc..925b78a76 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -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';
@@ -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";
--
GitLab