refs #1648 : added - routine for non-permalink pages

Needlworks · Feb 27, 2014 · 4da808c · 4da808c
1 parent a3439f3
commit 4da808c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/interface/common/blog/begin.php b/interface/common/blog/begin.php
@@ -18,8 +18,11 @@
 $view = str_replace('[##_SKIN_body_start_##]',getUpperView(isset($paging) ? $paging : null).'[##_SKIN_body_start_##]', $view);
 $view = str_replace('[##_SKIN_body_end_##]',getLowerView().getScriptsOnFoot().'[##_SKIN_body_end_##]', $view); // care the order for js function overloading issue.
 $automaticLink = "	<link rel=\"stylesheet\" href=\"".$context->getProperty('uri.default')."/resources/style/system.css\" type=\"text/css\" media=\"screen\" />\n";
-$canonicalLink = "  <link rel=\"canonical\" href=\"".$context->getProperty('uri.permalink')."\"/>\n";
-
+if (!is_null($context->getProperty('uri.permalink',null))) {
+	$canonicalLink = "  <link rel=\"canonical\" href=\"".$context->getProperty('uri.permalink')."\"/>\n";
+} else {
+	$canonicalLink = '';
+}
 dress('SKIN_head_end', $canonicalLink.$automaticLink."[##_SKIN_head_end_##]", $view);