Merge b45c0f2840 into 4bc8bb4181

config/config.ini.example

@@ -38,6 +38,9 @@ google.publisher = ""
 ; Google analytics
 google.analytics.id = ""
 
+; Google WMT ID verification
+google.wmt.id = ""
+
 ; Pagination, RSS, and JSON
 posts.perpage = "5"
 tag.perpage = "10"
@@ -81,4 +84,4 @@ lightbox = "off"
 views.root = "themes/logs"
 
 ; Framework config. No need to edit.
-views.layout = "layout"
+views.layout = "layout"

system/includes/functions.php

@@ -1064,6 +1064,15 @@ EOF;
 	}
 }
 
+// Google Web Master Tool
+function wmt(){
+	$wmt_id = config('google.wmt.id');
+	$meta_wmt = '<meta name="google-site-verification" content="' . $wmt_id . '" />';
+	if (!empty($wmt_id)) {
+		return $meta_wmt;
+	}
+}
+
 // Menu
 function menu(){
 	$menu = config('blog.menu');
@@ -1733,4 +1742,4 @@ function is_csrf_proper($csrf_token)
 		return true;
 	}
 	return false;
-}
+}

themes/clean/layout.html.php

@@ -5,6 +5,7 @@
 	<link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet" />
 	<link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet" />
 	<?php if (publisher()):?><link href="<?php echo publisher() ?>" rel="publisher" /><?php endif;?>
+	<?php if (wmt()):?><?php echo wmt() ?><?php endif;?>
 	<!--[if lt IE 9]>
 		<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
@@ -36,4 +37,4 @@
 	</section>
 	<?php if (analytics()):?><?php echo analytics() ?><?php endif;?>
 </body>
-</html>
+</html>

themes/default/layout.html.php

@@ -5,6 +5,7 @@
 	<link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet" />
 	<link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 	<?php if (publisher()):?><link href="<?php echo publisher() ?>" rel="publisher" /><?php endif;?>
+	<?php if (wmt()):?><?php echo wmt() ?><?php endif;?>
 	<!--[if lt IE 9]>
 		<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
@@ -61,4 +62,4 @@
 	</div>
 	<?php if (analytics()):?><?php echo analytics() ?><?php endif;?>
 </body>
-</html>
+</html>

themes/logs/layout.html.php

@@ -5,6 +5,7 @@
 	<link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet" />
 	<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic' rel='stylesheet' type='text/css'>
 	<?php if (publisher()):?><link href="<?php echo publisher() ?>" rel="publisher" /><?php endif;?>
+	<?php if (wmt()):?><?php echo wmt() ?><?php endif;?>
 	<!--[if lt IE 9]>
 		<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
@@ -71,4 +72,4 @@
 	</div>
 	<?php if (analytics()):?><?php echo analytics() ?><?php endif;?>
 </body>
-</html>
+</html>