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 6abfe941f5dcdc0b446c182af2911d0df4f61f5e (commit)
via 00ac43f5ebcc9f8e40e6203c9bd360331399054d (commit)
from 8cdb27a85a725b76b41037b85424c9acde429224 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=6abfe941f5dcdc0b446c182af2911d0df4f61f5e
commit 6abfe941f5dcdc0b446c182af2911d0df4f61f5e
Merge: 00ac43f 8cdb27a
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 5 12:30:14 2016 +0200
Merge branch 'master' of
git+ssh://scm.fusionforge.org//scmrepos/git/fusionforge/fusionforge
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=00ac43f5ebcc9f8e40e6203c9bd360331399054d
commit 00ac43f5ebcc9f8e40e6203c9bd360331399054d
Author: Marc-Etienne Vargenau <[email protected]>
Date: Tue Jul 5 12:28:44 2016 +0200
Revert "Add line feed between javascripts and stylesheets"
This reverts commit d3ad411506795d5c9c8da736f20c0fe54dd040bd.
diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 00a34bb..cd9f7c0 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -208,7 +208,7 @@ class Layout extends FFError {
function getJavascripts() {
$code = '';
foreach ($this->javascripts as $js) {
- $code .= "\t".html_e('script', array('type' =>
'text/javascript', 'src' => util_make_uri($js)), '', false)."\n";
+ $code .= html_e('script', array('type' =>
'text/javascript', 'src' => util_make_uri($js)), '', false);
}
$this->javascripts = array();
return $code;
@@ -221,9 +221,9 @@ class Layout extends FFError {
$code = '';
foreach ($this->stylesheets as $c) {
if ($c['media']) {
- $code .= "\t".html_e('link', array('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 .= "\t".html_e('link', array('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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
