[Fusionforge-commits] FusionForge branch master updated. b4c692eacde167d820c10296874b7fbe81cd9f4a
Franck VILLAUME
nerville at fusionforge.org
Thu Feb 27 23:32:57 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, master has been updated
via b4c692eacde167d820c10296874b7fbe81cd9f4a (commit)
via e586049d54be114408ecfd20cc979ff049c6598c (commit)
via dc543105eb5d997c3c56f499fff3611f6ab2b447 (commit)
via dae149647fb65b01d7e0eae10187cdc6f73c584b (commit)
via b2829bb7bb379aa9ce87ea436a7c6d2ec590c52b (commit)
via 298a6fbb15f1b91986450c731a215455d8b6d953 (commit)
via d30bf60dc906f620da690b21051fd325093cbf4e (commit)
via 28c8c8c1edce93913a56bdaecafd51f08b9ab707 (commit)
via ba59a00e5c00ba3fd4bdd67bf48a7ea68958ab13 (commit)
from fb94b7f1995ca9703cf09c2f74d02eeb30a93d33 (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 b4c692eacde167d820c10296874b7fbe81cd9f4a
Merge: fb94b7f e586049
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Thu Feb 27 23:32:53 2014 +0100
merge Branch_5_3
diff --cc src/www/include/Layout.class.php
index 8c897b4,ba17932..4092dc3
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@@ -217,7 -211,8 +211,7 @@@ class Layout extends Error
function getJavascripts() {
$code = '';
foreach ($this->javascripts as $js) {
- $code .= html_e('script', array('type' => 'text/javascript', 'src' => $js), '', false);
- $code .= "\t\t\t";
- $code .= '<script type="text/javascript" src="'.util_make_uri($js).'"></script>'."\n";
++ $code .= html_e('script', array('type' => 'text/javascript', 'src' => util_make_uri($js)), '', false);
}
$this->javascripts = array();
return $code;
@@@ -229,10 -224,11 +223,10 @@@
function getStylesheets() {
$code = '';
foreach ($this->stylesheets as $c) {
- $code .= "\t\t\t";
if ($c['media']) {
- $code .= html_e('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $c['css'], 'media' => $c['media']));
- $code .= '<link rel="stylesheet" type="text/css" href="'.util_make_uri($c['css']).'" media="'.$c['media'].'" />'."\n";
++ $code .= html_e('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => util_make_uri($c['css']), 'media' => $c['media']));
} else {
- $code .= html_e('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $c['css']));
- $code .= '<link rel="stylesheet" type="text/css" href="'.util_make_uri($c['css']).'"/>'."\n";
++ $code .= html_e('link', array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => util_make_uri$c['css'])));
}
}
$this->stylesheets = array();
-----------------------------------------------------------------------
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