Merge e40b5848e4 into fdb93641bc

system/includes/functions.php

@@ -969,6 +969,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;
+    }
+}
+
 // Google Publisher (Google+ page).
 function publisher() {
     $publisher = config('google.publisher');

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>