[Fusionforge-commits] FusionForge branch Branch_5_2 updated. dc543105eb5d997c3c56f499fff3611f6ab2b447
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 27 23:28:52 CET 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, Branch_5_2 has been updated
via dc543105eb5d997c3c56f499fff3611f6ab2b447 (commit)
from 28c8c8c1edce93913a56bdaecafd51f08b9ab707 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit dc543105eb5d997c3c56f499fff3611f6ab2b447
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 27 23:08:18 2014 +0100
use util_make_uri to deal with url_prefix
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 079badb..6d15c7d 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -181,9 +181,6 @@ class Layout extends Error {
$js .= '?'.date ("U", filemtime($filename));
}
}
- if (forge_get_config('url_prefix')){
- $js = forge_get_config('url_prefix').$js;
- }
$this->javascripts[] = $js;
}
}
@@ -203,9 +200,6 @@ class Layout extends Error {
$css .= '?'.date ("U", filemtime($filename));
}
}
- if (forge_get_config('url_prefix')){
- $css = forge_get_config('url_prefix').$css;
- }
$this->stylesheets[] = array('css' => $css, 'media' => $media);
}
}
@@ -214,7 +208,7 @@ class Layout extends Error {
$code = '';
foreach ($this->javascripts as $js) {
$code .= "\t\t\t";
- $code .= '<script type="text/javascript" src="'.$js.'"></script>'."\n";
+ $code .= '<script type="text/javascript" src="'.util_make_uri($js).'"></script>'."\n";
}
return $code;
}
@@ -224,9 +218,9 @@ class Layout extends Error {
foreach ($this->stylesheets as $c) {
$code .= "\t\t\t";
if ($c['media']) {
- $code .= '<link rel="stylesheet" type="text/css" href="'.$c['css'].'" media="'.$c['media'].'" />'."\n";
+ $code .= '<link rel="stylesheet" type="text/css" href="'.util_make_uri($c['css']).'" media="'.$c['media'].'" />'."\n";
} else {
- $code .= '<link rel="stylesheet" type="text/css" href="'.$c['css'].'"/>'."\n";
+ $code .= '<link rel="stylesheet" type="text/css" href="'.util_make_uri($c['css']).'"/>'."\n";
}
}
return $code;
-----------------------------------------------------------------------
Summary of changes:
src/www/include/Layout.class.php | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list