tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed conflict

This commit is contained in:
Michael Strong 2014-02-16 20:36:18 +00:00
parent bb714ccea2
commit 74fb217661
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/Blog.php
View File

@ -94,15 +94,9 @@ class Blog extends Page {
**/
public function getExcludedSiteTreeClassNames() {
$classes = array();
<<<<<<< HEAD
$tmpClasses = $this->allowedChildren();
foreach($tmpClasses as $class) {
if(!Config::inst()->get($class, "show_in_sitetree")) {
=======
$tmpClasses = ClassInfo::subClassesFor("BlogPost");
if(!Config::inst()->get(get_class($this), "show_in_sitetree")) {
foreach($tmpClasses as $class) {
>>>>>>> 7d178790f605ae8740a99f1804801e6d985ca755
$classes[$class] = $class;
}
}
@ -411,4 +405,4 @@ class Blog_Controller extends Page_Controller {
return $this->Link("rss");
}
}
}