From 04fecd00bd691b4d79be12bb9728a500c1639232 Mon Sep 17 00:00:00 2001
From: Nikolai R Kristiansen <nikolaik@gmail.com>
Date: Sat, 28 Mar 2015 19:50:36 +0100
Subject: [PATCH] Let wordpress handle the title

---
 wp-content/themes/aktiv2014/functions.php | 13 +++++++------
 wp-content/themes/aktiv2014/header.php    |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/wp-content/themes/aktiv2014/functions.php b/wp-content/themes/aktiv2014/functions.php
index 2bace77..185d7ef 100644
--- a/wp-content/themes/aktiv2014/functions.php
+++ b/wp-content/themes/aktiv2014/functions.php
@@ -1,7 +1,8 @@
 <?php
-add_theme_support( 'menus' );
-add_theme_support( 'post-thumbnails');
-add_theme_support( 'automatic-feed-links' );
+add_theme_support('menus');
+add_theme_support('post-thumbnails');
+add_theme_support('automatic-feed-links');
+add_theme_support('title-tag');
 
 $content_width = 770;
 
@@ -107,7 +108,7 @@ function linkify($subject, $pattern, $link) {
  * Original author: Justin Tadlock (theme Hybrid).
  */
 function neuf_get_term_name() {
-    $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ); 
+    $term = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );
     return $term->name;
 }
 
@@ -264,7 +265,7 @@ function get_category_formatted() {
 if (class_exists('WP_Customize_Control')) {
     class Customize_Textarea_Control extends WP_Customize_Control {
         public $type = 'textarea';
-     
+
         public function render_content() {
             ?>
             <label>
@@ -306,4 +307,4 @@ add_action( 'customize_register', 'neuf_customize_register' );
 
 require_once('neuf_widgets.php');
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-content/themes/aktiv2014/header.php b/wp-content/themes/aktiv2014/header.php
index b06fb75..cfa8932 100644
--- a/wp-content/themes/aktiv2014/header.php
+++ b/wp-content/themes/aktiv2014/header.php
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:fb="http://www.facebook.com/2008/fbml" xml:lang="no" lang="no">
 <head>
-	<meta charset="utf-8" />
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="robots" content="index,follow" />
     <meta name="x-stylesheet-directory" content="<?php bloginfo( 'stylesheet_directory' ); ?>" />
@@ -11,7 +11,7 @@
     <meta name="x-user-id" content="<?php echo $user->ID; ?>" />
 
     <meta name="x-siteurl" content="<?php echo get_option('siteurl'); ?>" />
-    <title><?php wp_title(); ?></title>
+    <title><?php wp_title('|', true, true); ?></title>
     <link rel="icon" type="image/png" href="favicon.ico" />
     <link rel="alternate" type="application/rss+xml" href="<?php echo get_feed_url(); ?>" title="aktiv.neuf.no - Nyheter" />