Commits

Christoffer Niska committed dc258e4

fixed merge issues

Comments (0)

Files changed (2)

components/Cms.php

 	 */
 	public $renderer = array('class'=>'cms.components.CmsBaseRenderer');
 	/**
-	// todo: do something about the flash message categories, an array maybe instead of 4 properties?
-	 */
-	public $renderer = array('class'=>'cms.components.CmsBaseRenderer');
-	/**
 	 * @var boolean indicates whether to auto create nodes when they are requested.
 	 * Defaults to true.
 	 */
 		$node->name = $name;
 		return $node->save(false);
 	}
-
-	/**
-	 * Returns whether a child node of a specific page is active.
-	 * @param CmsNode $node the node
-	 * @return boolean the result
-	 */
-	protected function isChildActive($node)
-	{
-		foreach ($node->children as $child)
-			if ($this->isActive($child->name) || $this->isChildActive($child))
-				return true;
-
-		return false;
-	}
 	
 	/**
 	 * Returns whether the currently logged in user has access to update cms content.

models/CmsNode.php

 	{
 		return (bool) $this->published;
 	}
-
-	/**
-	 * Renders this node.
-	 * @return string the rendered node
-	 */
-	public function render()
-	{
-		return Yii::app()->cms->renderer->render($this);
-	}
-
-	/**
-	 * Renders this node as a widget.
-	 * @return string the rendered widget
-	 */
-	public function renderWidget()
-	{
-		return Yii::app()->cms->renderer->renderWidget($this);
-	}
-
-	public function getPublished()
-	{
-		return (bool) $this->published;
-	}
 }