aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhubzilla <git@macgirvin.com>2016-06-26 08:22:16 +1000
committerGitHub <noreply@github.com>2016-06-26 08:22:16 +1000
commit7805a3c52709552d60863b89c81ea36636968237 (patch)
tree9f779b4b281f60969bb1fdb5d0ba0bf1833e2479
parentec3651d216a5eafcb8019825bc6751e6ffa8c198 (diff)
parent2dc1236dcae487bf3887942a2e58a240157bb896 (diff)
downloadvolse-hubzilla-7805a3c52709552d60863b89c81ea36636968237.tar.gz
volse-hubzilla-7805a3c52709552d60863b89c81ea36636968237.tar.bz2
volse-hubzilla-7805a3c52709552d60863b89c81ea36636968237.zip
Merge pull request #439 from Treer/cdn
Allow absolute links to css and js files (for CDN links)
-rwxr-xr-xinclude/plugin.php28
1 files changed, 20 insertions, 8 deletions
diff --git a/include/plugin.php b/include/plugin.php
index c95f8cbf9..3f60e5e04 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -551,15 +551,21 @@ function head_get_css() {
}
function format_css_if_exists($source) {
- if (strpos($source[0], '/') !== false)
+ $path_prefix = script_path() . '/';
+
+ if (strpos($source[0], '/') !== false) {
+ // The source is a URL
$path = $source[0];
- else
+ // If the url starts with // then it's an absolute URL
+ if($source[0][0] === '/' && $source[0][1] === '/') $path_prefix = '';
+ } else {
+ // It's a file from the theme
$path = theme_include($source[0]);
+ }
if($path) {
- $path = script_path() . '/' . $path;
$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
- return '<link rel="stylesheet" href="' . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
+ return '<link rel="stylesheet" href="' . $path_prefix . $path . $qstring . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
}
}
@@ -643,14 +649,20 @@ function head_get_main_js() {
}
function format_js_if_exists($source) {
- if(strpos($source,'/') !== false)
+ $path_prefix = script_path() . '/';
+
+ if(strpos($source,'/') !== false) {
+ // The source is a URL
$path = $source;
- else
+ // If the url starts with // then it's an absolute URL
+ if($source[0][0] === '/' && $source[0][1] === '/') $path_prefix = '';
+ } else {
+ // It's a file from the theme
$path = theme_include($source);
+ }
if($path) {
- $path = script_path() . '/' . $path;
$qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
- return '<script src="' . $path . $qstring . '" ></script>' . "\r\n" ;
+ return '<script src="' . $path_prefix . $path . $qstring . '" ></script>' . "\r\n" ;
}
}