From 5e0a5283b2d95f124edd2188df7d56245fe962bc Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 15 Sep 2007 02:05:23 +0000
Subject: [PATCH] fixed bugs introduced by merging branches/gsoc

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41907 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/SiteTree.php | 2 --
 security/Security.php   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php
index b4f1de3cd..4729d8ddb 100644
--- a/core/model/SiteTree.php
+++ b/core/model/SiteTree.php
@@ -645,8 +645,6 @@ class SiteTree extends DataObject {
 	public function MetaTags($includeTitle = true) {
 		$tags = "";
 		if($includeTitle === true || $includeTitle == 'true') {
-			$tags .= "<title>" . Convert::raw2xml($this->MetaTitle ? $this->MetaTitle : $this->Title) . "</title>\n";
-		if($includeTitle == true) {
 			$tags .= "<title>" . Convert::raw2xml(($this->MetaTitle)
 				? $this->MetaTitle
 				: $this->Title) . "</title>\n";
diff --git a/security/Security.php b/security/Security.php
index f4e739f71..59d2dbb7b 100644
--- a/security/Security.php
+++ b/security/Security.php
@@ -179,7 +179,7 @@ class Security extends Controller {
 
 		$controller = new Page_Controller($tmpPage);
 		$controller->init();
-		Controller::$currentController = $controller;
+		//Controller::$currentController = $controller;
 
 		if(SSViewer::hasTemplate("Security_login")) {
 			return $controller->renderWith(array("Security_login", "Page"));