Business/SiteWriter
2
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Fix CORS issue

Browse Source
This commit is contained in:
Skylar Ittner 2018-05-04 21:35:38 -06:00
parent 373044eb47
commit a038bde743
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/themefunctions.php
View File

@ -220,7 +220,11 @@ function get_setting($key, $echo = false) {
function get_theme_url($echo = true) { function get_theme_url($echo = true) {
$db = getdatabase(); $db = getdatabase();
$site = $db->get('sites', ["sitename", "url", "theme"], ["siteid" => getsiteid()]); $site = $db->get('sites', ["sitename", "url", "theme"], ["siteid" => getsiteid()]);
$url = formatsiteurl($site["url"]) . "themes/" . SITE_THEME; if (isset($_GET['edit']) || isset($_GET['in_sw'])) {
$url = URL . "/public/themes/" . SITE_THEME;
} else {
$url = formatsiteurl($site["url"]) . "themes/" . SITE_THEME;
}
if ($echo) { if ($echo) {
echo $url; echo $url;
} else { } else {
@ -240,7 +244,7 @@ function get_theme_color_url($echo = true) {
if (!file_exists(__DIR__ . "/../public/themes/" . SITE_THEME . "/colors/" . $site['color'])) { if (!file_exists(__DIR__ . "/../public/themes/" . SITE_THEME . "/colors/" . $site['color'])) {
$site['color'] = "default"; $site['color'] = "default";
} }
$url = formatsiteurl($site["url"]) . "themes/" . SITE_THEME . "/colors/" . $site["color"]; $url = get_theme_url(false) . "/colors/" . $site["color"];
if ($echo) { if ($echo) {
echo $url; echo $url;
} else { } else {

3
public/themes/.htaccess Normal file
View File

@ -0,0 +1,3 @@
<IfModule mod_headers.c>
Header set Access-Control-Allow-Origin "*"
</IfModule>