Commit: 53ba83ebb256fefcc26f577c5557edd1b2200525 Author: Hannes Magnusson <[email protected]> Tue, 19 Nov 2013 18:40:37 -0800 Parents: d366d4647237737995e3d5ccb92052eea45b7520 Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=53ba83ebb256fefcc26f577c5557edd1b2200525 Log: Allow the browsers to cache these files now Changed paths: M include/footer.inc M include/header.inc Diff: diff --git a/include/footer.inc b/include/footer.inc index 7417263..d84cfd0 100644 --- a/include/footer.inc +++ b/include/footer.inc @@ -1,7 +1,3 @@ -<?php -// Disable caching, annoying while developing -$v = "?v=" .$_SERVER["REQUEST_TIME"]; -?> </section><!-- layout-content --> <?php if (!empty($config['spanning-content'])) { @@ -65,7 +61,7 @@ $v = "?v=" .$_SERVER["REQUEST_TIME"]; </script> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js";></script> - <script type="text/javascript" src="/js/common.js<?php echo $v?>"></script> + <script type="text/javascript" src="/js/common.js"></script> <?php include 'uservoice.inc' ?> </body> diff --git a/include/header.inc b/include/header.inc index d654f96..35fc4c5 100755 --- a/include/header.inc +++ b/include/header.inc @@ -1,7 +1,5 @@ <?php /* $Id$ */ -// Disable caching, annoying while developing -$v = "?v=" .$_SERVER["REQUEST_TIME"]; header("Expires: Thu, 19 Nov 1981 08:52:00 GMT"); header("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); header("Pragma: no-cache"); @@ -41,8 +39,8 @@ if (isset($shortname) && $shortname) { <?php endforeach ?> <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'> - <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/theme-base.css<?php echo $v?>" media="screen" /> - <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/theme-medium.css<?php echo $v?>" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/theme-base.css" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/theme-medium.css" media="screen" /> <?php if(isset($config['css']) && is_array($config['css'])): @@ -55,15 +53,15 @@ if (isset($shortname) && $shortname) { ?> <!--[if lte IE 7]> - <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/workarounds.ie7.css<?php echo $v?>" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/workarounds.ie7.css" media="screen" /> <![endif]--> <!--[if lte IE 9]> - <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/workarounds.ie9.css<?php echo $v?>" media="screen" /> + <link rel="stylesheet" type="text/css" href="<?php echo $STATIC_ROOT ?>styles/workarounds.ie9.css" media="screen" /> <![endif]--> <!--[if IE]> - <script type="text/javascript" src="<?php echo $STATIC_ROOT ?>js/ext/html5.js<?php echo $v?>"></script> + <script type="text/javascript" src="<?php echo $STATIC_ROOT ?>js/ext/html5.js"></script> <![endif]--> <?php if (!empty($_SERVER["BASE_HREF"])): ?> -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
