aboutsummaryrefslogtreecommitdiffstats
path: root/include/plugin.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-21 17:09:13 -0700
committerredmatrix <git@macgirvin.com>2016-04-21 17:09:13 -0700
commit540800da959bc03df21d02c31142a1ef389fb855 (patch)
treed73e1361dfe9b9c36eb0857d786deafa7621d1e2 /include/plugin.php
parent1ff189ee907e6465dfb35118f789f10e714d38a1 (diff)
parentcb8c83a42bc827d7b2fc589d3289ec62c4167398 (diff)
downloadvolse-hubzilla-540800da959bc03df21d02c31142a1ef389fb855.tar.gz
volse-hubzilla-540800da959bc03df21d02c31142a1ef389fb855.tar.bz2
volse-hubzilla-540800da959bc03df21d02c31142a1ef389fb855.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/plugin.php')
-rwxr-xr-xinclude/plugin.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/include/plugin.php b/include/plugin.php
index 29f987e78..80e3ae20e 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -535,8 +535,11 @@ function format_css_if_exists($source) {
else
$path = theme_include($source[0]);
- if($path)
- return '<link rel="stylesheet" href="' . script_path() . '/' . $path . '" type="text/css" media="' . $source[1] . '">' . "\r\n";
+ 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";
+ }
}
/*
@@ -612,8 +615,11 @@ function format_js_if_exists($source) {
$path = $source;
else
$path = theme_include($source);
- if($path)
- return '<script src="' . script_path() . '/' . $path . '" ></script>' . "\r\n" ;
+ if($path) {
+ $path = script_path() . '/' . $path;
+ $qstring = ((parse_url($path, PHP_URL_QUERY)) ? '&' : '?') . 'v=' . STD_VERSION;
+ return '<script src="' . $path . $qstring . '" ></script>' . "\r\n" ;
+ }
}
@@ -678,4 +684,4 @@ function folder_exists($folder)
// If it exist, check if it's a directory
return (($path !== false) && is_dir($path)) ? $path : false;
-} \ No newline at end of file
+}