tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

fixed bugs introduced by merging branches/gsoc

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@41907 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-15 02:05:23 +00:00
parent d292e5ccf0
commit 5e0a5283b2
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/model/SiteTree.php
View File

@ -645,8 +645,6 @@ class SiteTree extends DataObject {
public function MetaTags($includeTitle = true) { public function MetaTags($includeTitle = true) {
$tags = ""; $tags = "";
if($includeTitle === true || $includeTitle == 'true') { 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) $tags .= "<title>" . Convert::raw2xml(($this->MetaTitle)
? $this->MetaTitle ? $this->MetaTitle
: $this->Title) . "</title>\n"; : $this->Title) . "</title>\n";

2
security/Security.php
View File

@ -179,7 +179,7 @@ class Security extends Controller {
$controller = new Page_Controller($tmpPage); $controller = new Page_Controller($tmpPage);
$controller->init(); $controller->init();
Controller::$currentController = $controller; //Controller::$currentController = $controller;
if(SSViewer::hasTemplate("Security_login")) { if(SSViewer::hasTemplate("Security_login")) {
return $controller->renderWith(array("Security_login", "Page")); return $controller->renderWith(array("Security_login", "Page"));