Merge pull request #1117 from eamdog/master

Mistakes were made in #1113. Metadata has correct info now.
anchorcms · Jun 30, 2016 · 7a8ba70 · 7a8ba70
2 parents 5b124e0 + e9c4a70
commit 7a8ba70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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'); ?>">