opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Calls to StyleUtils use the new constructor

This commit is contained in:
Anna Dabrowska 2019-02-21 12:24:16 +01:00
parent 7a6337a8f8
commit 4845eff54d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/Manifest.php
View File

@ -29,7 +29,7 @@ class Manifest
}
$styleUtil = new \dokuwiki\StyleUtils();
$styleIni = $styleUtil->cssStyleini($conf['template']);
$styleIni = $styleUtil->cssStyleini();
$replacements = $styleIni['replacements'];
if (empty($manifest['background_color'])) {

2
inc/template.php
View File

@ -247,7 +247,7 @@ function tpl_metaheaders($alt = true) {
}
$styleUtil = new \dokuwiki\StyleUtils();
$styleIni = $styleUtil->cssStyleini($conf['template']);
$styleIni = $styleUtil->cssStyleini();
$replacements = $styleIni['replacements'];
if (!empty($replacements['__theme_color__'])) {
$head['meta'][] = array('name' => 'theme-color', 'content' => $replacements['__theme_color__']);

4
lib/exe/css.php
View File

@ -45,8 +45,8 @@ function css_out(){
if(!$tpl) $tpl = $conf['template'];
// load style.ini
$styleUtil = new \dokuwiki\StyleUtils();
$styleini = $styleUtil->cssStyleini($tpl, $INPUT->bool('preview'));
$styleUtil = new \dokuwiki\StyleUtils($tpl, $INPUT->bool('preview'));
$styleini = $styleUtil->cssStyleini();
// cache influencers
$tplinc = tpl_incdir($tpl);

4
lib/plugins/styling/admin.php
View File

@ -58,8 +58,8 @@ class admin_plugin_styling extends DokuWiki_Admin_Plugin {
global $conf;
global $ID;
$styleUtil = new \dokuwiki\StyleUtils();
$styleini = $styleUtil->cssStyleini($conf['template'], true);
$styleUtil = new \dokuwiki\StyleUtils($conf['template'], true);
$styleini = $styleUtil->cssStyleini();
$replacements = $styleini['replacements'];
if($this->ispopup) {

4
lib/tpl/index.php
View File

@ -46,8 +46,8 @@ require_once(DOKU_INC.'inc/init.php');
// get merged style.ini
define('SIMPLE_TEST', true); // hack to prevent css output and headers
require_once(DOKU_INC.'lib/exe/css.php');
$styleUtils = new \dokuwiki\StyleUtils();
$ini = $styleUtils->cssStyleini($conf['template']);
$styleUtils = new \dokuwiki\StyleUtils($conf['template']);
$ini = $styleUtils->cssStyleini();
if ($ini) {
echo '<table>';