Merge pull request #1117 from eamdog/master

CraigChilds94 · web-flow · commit 7a8ba70d8c9f · 2016-06-30T21:02:47.000+01:00
Mistakes were made in #1113. Metadata has correct info now.
diff --git a/anchor/functions/pages.php b/anchor/functions/pages.php
@@ -72,7 +72,7 @@ function page_description($default = '')
 	if ($title = Registry::prop('article', 'description')) {
 		return $title;
 	}
-	if ($title = Registry::prop('site', 'description')) {
+	if ($title = Config::meta('description')) {
 		return $title;
 	}
 	return $default;
diff --git a/themes/default/header.php b/themes/default/header.php
@@ -24,7 +24,7 @@
 	    <meta name="viewport" content="width=device-width">
 	    <meta name="generator" content="Anchor CMS">
 
-	    <meta property="og:title" content="<?php echo page_name(); ?>">
+	    <meta property="og:title" content="<?php echo page_title(); ?>">
 	    <meta property="og:type" content="website">
 	    <meta property="og:url" content="<?php echo e(current_url()); ?>">
 	    <meta property="og:image" content="<?php echo theme_url('img/og_image.gif'); ?>">

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function page_description($default = '')`
`72`	`72`	`if ($title = Registry::prop('article', 'description')) {`
`73`	`73`	`return $title;`
`74`	`74`	`}`
`75`		`- if ($title = Registry::prop('site', 'description')) {`
	`75`	`+ if ($title = Config::meta('description')) {`
`76`	`76`	`return $title;`
`77`	`77`	`}`
`78`	`78`	`return $default;`