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

Merged revisions 52719 via svnmerge from

Browse Source 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r52719 | sminnee | 2008-04-15 11:56:10 +1200 (Tue, 15 Apr 2008) | 1 line
  
  Fixed ContentController where ->dataRecord is empty
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53520 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-04-26 06:52:59 +00:00
parent 45804905ed
commit 8a5b360abd
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/control/ContentController.php
View File

@ -92,7 +92,9 @@ class ContentController extends Controller {
return; return;
} }
$this->dataRecord->extend('contentcontrollerInit', $this); if($this->dataRecord) $this->dataRecord->extend('contentcontrollerInit', $this);
else singleton('SiteTree')->extend('contentcontrollerInit', $this);
if(Director::redirected_to()) return; if(Director::redirected_to()) return;
Director::set_site_mode('site'); Director::set_site_mode('site');