cvs: phpweb /include layout.inc
| From: | Hannes Magnusson | Date: | Thu, 04 Jun 2009 11:05:27 +0000 |
| Subject: | cvs: phpweb /include layout.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-4959@lists.php.net to get a copy of this message | ||
bjori Thu Jun 4 11:05:27 2009 UTC
Modified files:
/phpweb/include layout.inc
Log:
Fix notice and wrong markup on non-existing pages
http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.307&r2=1.308&diff_format=u
Index: phpweb/include/layout.inc
diff -u phpweb/include/layout.inc:1.307 phpweb/include/layout.inc:1.308
--- phpweb/include/layout.inc:1.307 Fri May 22 08:11:35 2009
+++ phpweb/include/layout.inc Thu Jun 4 11:05:26 2009
@@ -1,5 +1,5 @@
<?php
-/* $Id: layout.inc,v 1.307 2009/05/22 08:11:35 bjori Exp $ */
+/* $Id: layout.inc,v 1.308 2009/06/04 11:05:26 bjori Exp $ */
// Set the static content root differently on php.net
if ($MYSITE == "http://www.php.net/") {
@@ -140,6 +140,7 @@
// Base href setting for URL shortcuts to work
if (!empty($_SERVER['BASE_HREF'])) {
$base = "\n <base href=\"{$_SERVER['BASE_HREF']}\" />";
+ $canonical = '<link rel="canonical" href="http://php.net/' . $_SERVER['BASE_PAGE'] . '
/>';
}
// Define layout helper in case we need it
@@ -205,7 +206,7 @@
<!--[if IE]><![endif]><![endif]-->
<meta http-equiv="Content-Type" content="text/html;
charset={$config['charset']}"/>
<link rel="shortcut icon"
href="{$_SERVER['STATIC_ROOT']}/favicon.ico" />{$link}
- <link rel="canonical" href="http://php.net/{$_SERVER['BASE_PAGE']}"
/>
+ $canonical
<script type="text/javascript"
src="{$_SERVER['STATIC_ROOT']}/userprefs.js"></script>{$base}{$meta}{$moreheadtags}
</head>
<body{$onload}>