From 072dbc914368dca4ae475d7487c44b56ada4ba5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerry=20Wei=C3=9Fbach?= <gerry.w@gammaproduction.de>
Date: Wed, 22 Feb 2017 07:46:35 +0100
Subject: [PATCH] Revert Template changes from css-modifications-branch. No
Flavours. If someone wants that, it is easier to be done using a plugin.
---
inc/template.php | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/inc/template.php b/inc/template.php
index a7f883866..daa39ff4c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -395,16 +395,10 @@ function tpl_metaheaders($alt = true) {
}
}
- // load stylesheets
- foreach( scandir( template('') ) as $ini_file ) {
- // allow all .ini files in a templates 'ini' dir to be a flavour for stylesheet creation
- list( $flavour, $ext ) = explode( '.', $ini_file, 2 );
- if ( $ext != 'ini' ) continue;
- $head['link'][] = array(
- 'rel' => 'stylesheet', 'type'=> 'text/css',
- 'href'=> DOKU_BASE.'lib/exe/css.php?t='.rawurlencode($conf['template']).'&f='.rawurlencode($flavour).'&tseed='.$tseed
- );
- }
+ $head['link'][] = array(
+ 'rel' => 'stylesheet', 'type'=> 'text/css',
+ 'href'=> DOKU_BASE.'lib/exe/css.php?t='.rawurlencode($conf['template']).'&tseed='.$tseed
+ );
// make $INFO and other vars available to JavaScripts
$json = new JSON();
--
GitLab