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

Merge pull request #2881 from sminnee/fix-forum-templates

Browse Source 
FIX: Fixed regression in ContentController template selection.
This commit is contained in:
Ingo Schommer 2014-02-20 23:02:40 +13:00
commit d6da92edeb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
view/SSViewer.php
View File

@ -721,6 +721,13 @@ class SSViewer {
foreach($classes as $class) { foreach($classes as $class) {
$template = $class . $suffix; $template = $class . $suffix;
if(SSViewer::hasTemplate($template)) $templates[] = $template; if(SSViewer::hasTemplate($template)) $templates[] = $template;
// If the class is "Page_Controller", look for Page.ss
if(stripos($class,'_controller') !== false) {
$template = str_ireplace('_controller','',$class) . $suffix;
if(SSViewer::hasTemplate($template)) $templates[] = $template;
}
if($baseClass && $class == $baseClass) break; if($baseClass && $class == $baseClass) break;
} }
return $templates; return $templates;