com web/php: urlencode & (amp) and add newline after <script>: include/footer.inc include/header.inc
| From: | Dejan Marjanovic | Date: | Wed, 04 Dec 2013 21:06:52 +0000 |
| Subject: | com web/php: urlencode & (amp) and add newline after <script>: include/footer.inc include/header.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-17365@lists.php.net to get a copy of this message | ||
Commit: 25a38fd4a3fc448b37e94ea4b5fb117e1bde1ad5
Author: Dejan Marjanovic <dejan.marjanovic@gmail.com> Wed, 4 Dec 2013 22:06:52
+0100
Parents: c61c0b93985aed5814aa26d142f3700d2dfb0989
Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=25a38fd4a3fc448b37e94ea4b5fb117e1bde1ad5
Log:
urlencode & (amp) and add newline after <script>
Changed paths:
M include/footer.inc
M include/header.inc
Diff:
diff --git a/include/footer.inc b/include/footer.inc
index b8a2db2..8c49e17 100644
--- a/include/footer.inc
+++ b/include/footer.inc
@@ -62,15 +62,15 @@
<!-- External and third party libraries. -->
<script type="text/javascript"
src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
- <script type="text/javascript"
src="/cached.php?f=/js/ext/hogan-2.0.0.min.js&t=2"></script>
- <script type="text/javascript"
src="/cached.php?f=/js/ext/typeahead.min.js&t=2"></script>
+ <script type="text/javascript"
src="/cached.php?f=/js/ext/hogan-2.0.0.min.js&t=2"></script>
+ <script type="text/javascript"
src="/cached.php?f=/js/ext/typeahead.min.js&t=2"></script>
<?php
// Nick bjori's last modified code for our own JS files.
$jsfiles = array('search.js', 'common.js');
foreach ($jsfiles as $filename) {
$path = dirname(dirname(__FILE__)).'/js/'.$filename;
- echo '<script type="text/javascript"
src="/cached.php?f=/js/'.$filename.'&t='.@filemtime($path).'"></script>';
+ echo '<script type="text/javascript"
src="/cached.php?f=/js/'.$filename.'&t='.@filemtime($path).'"></script>',
PHP_EOL;
}
include 'uservoice.inc';
diff --git a/include/header.inc b/include/header.inc
index 9345d1d..f8d39bf 100755
--- a/include/header.inc
+++ b/include/header.inc
@@ -50,7 +50,7 @@ if (isset($shortname) && $shortname) {
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,400italic,600italic|Source+Code+Pro&subset=latin,latin-ext'
rel='stylesheet' type='text/css'>
<?php foreach($CSS as $filename => $modified): ?>
-<link rel="stylesheet" type="text/css" href="<?php echo $MYSITE
?>cached.php?f=styles/<?php echo $filename?>&t=<?php echo $modified?>"
media="screen">
+<link rel="stylesheet" type="text/css" href="<?php echo $MYSITE
?>cached.php?f=styles/<?php echo $filename?>&t=<?php echo $modified?>"
media="screen">
<?php endforeach ?>
<!--[if lte IE 7]>
@@ -73,7 +73,7 @@ if (isset($shortname) && $shortname) {
$jsfiles = array('ext/modernizr.js');
foreach ($jsfiles as $filename) {
$path = dirname(dirname(__FILE__)).'/js/'.$filename;
- echo '<script type="text/javascript" src="' . $MYSITE .
'cached.php?f=/js/'.$filename.'&t='.@filemtime($path).'"></script>';
+ echo '<script type="text/javascript" src="' . $MYSITE .
'cached.php?f=/js/'.$filename.'&t='.@filemtime($path).'"></script>';
}
?>
</head>