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

Fixed merge conflict in blog

Browse Source
This commit is contained in:
micmania1 2014-02-16 07:50:22 +00:00
commit bb714ccea2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
model/Blog.php
View File

@ -34,7 +34,7 @@ class Blog extends Page {
public function getCMSFields() { public function getCMSFields() {
$fields = parent::getCMSFields(); $fields = parent::getCMSFields();
$posts = $this->getBlogPosts(); $posts = $this->getBlogPosts();
$excluded = $this->getExcludedSiteTreeClassNames(); $excluded = $this->getExcludedSiteTreeClassNames();
if(!empty($excluded)) { if(!empty($excluded)) {
@ -94,9 +94,15 @@ class Blog extends Page {
**/ **/
public function getExcludedSiteTreeClassNames() { public function getExcludedSiteTreeClassNames() {
$classes = array(); $classes = array();
<<<<<<< HEAD
$tmpClasses = $this->allowedChildren(); $tmpClasses = $this->allowedChildren();
foreach($tmpClasses as $class) { foreach($tmpClasses as $class) {
if(!Config::inst()->get($class, "show_in_sitetree")) { 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; $classes[$class] = $class;
} }
} }