harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix several places where head_add_(css|js) functions have been used incorrectly. It appears that mistakes were made going back a long time and propagated. Here's the way it should work:

Browse Source 
- if there is no preceding / character, we look for the file within all the appropriate theme directories.
- otherwise the file should have a preceding /, which means use this path relative to the hubzilla basedir
- files beginning with // are considered to be schemeless URLs.

Therefore 'foo.css' means find the best theme-able representation of foo.css.
'/library/foo.css' means only use the version of foo.css that is in /library.
This commit is contained in:
zotlabs
2017-02-19 16:50:41 -08:00
parent 02e487f306
commit 573846707c
6 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
boot.php
View File

@@ -2225,7 +2225,7 @@ function construct_page(&$a) {
// Zotlabs\Render\Theme::debug();
if (($p = theme_include($current_theme[0] . '.js')) != '')
head_add_js($p);
head_add_js('/' . $p);
if (($p = theme_include('mod_' . App::$module . '.php')) != '')
require_once($p);
@@ -2237,10 +2237,13 @@ function construct_page(&$a) {
else
head_add_css(((x(App::$page, 'template')) ? App::$page['template'] : 'default' ) . '.css');
head_add_css('mod_' . App::$module . '.css');
if (($p = theme_include('mod_' . App::$module . '.css')) != '')
head_add_css('mod_' . App::$module . '.css');
head_add_css(Zotlabs\Render\Theme::url($installing));
head_add_js('mod_' . App::$module . '.js');
if (($p = theme_include('mod_' . App::$module . '.js')) != '')
head_add_js('mod_' . App::$module . '.js');
App::build_pagehead();