diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 14:24:18 -0800 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-12-06 14:24:18 -0800 |
| commit | 2393db39434d47a237fb01847213256d1396f8d1 (patch) | |
| tree | 319ad78afc55beebf982adfe75ad389cbad782b5 /include/plugin.php | |
| parent | a88ec1b1af954a447a666d3ff66b1d1df0a645db (diff) | |
| parent | 10db51e6c2f16f13b55abc0a23513cac90a311a4 (diff) | |
| download | volse-hubzilla-2393db39434d47a237fb01847213256d1396f8d1.tar.gz volse-hubzilla-2393db39434d47a237fb01847213256d1396f8d1.tar.bz2 volse-hubzilla-2393db39434d47a237fb01847213256d1396f8d1.zip | |
Merge branch 'dev'
Diffstat (limited to 'include/plugin.php')
| -rwxr-xr-x | include/plugin.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/plugin.php b/include/plugin.php index 1d4caac0f..1f4d60736 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -495,6 +495,15 @@ function format_css_if_exists($source) { return '<link rel="stylesheet" href="' . script_path() . '/' . $path . '" type="text/css" media="' . $source[1] . '">' . "\r\n"; } +/* + * This basically calculates the baseurl. We have other functions to do that, but + * there was an issue with script paths and mixed-content whose details are arcane + * and perhaps lost in the message archives. The short answer is that we're ignoring + * the URL which we are "supposed" to use, and generating script paths relative to + * the URL which we are currently using; in order to ensure they are found and aren't + * blocked due to mixed content issues. + */ + function script_path() { if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) $scheme = 'https'; |