Updated objects to implement CtkRenderable

Author: James Watts

Lib/CtkContent.php

@@ -357,12 +357,12 @@ final public function allowsEvents() {
 	}
 
 /**
- * Loads the template for the node.
+ * Parses the template for the node.
  *
  * @param string $path Path to the template.
  * @return string
  */
-	final public function load($path) {
+	final public function template($path) {
 		return '';
 	}
 

Lib/CtkElement.php

@@ -394,12 +394,12 @@ final public function allowsEvents() {
 	}
 
 /**
- * Loads the template for the node.
+ * Parses the template for the node.
  *
  * @param string $path Path to the template.
  * @return string
  */
-	final public function load($path) {
+	final public function template($path) {
 		return '';
 	}
 

Lib/CtkEvent.php

@@ -87,6 +87,7 @@ abstract class CtkEvent extends CtkObject implements CtkRenderable {
  * @param array $params The optional configuration parameters for the template.
  */
 	final public function __construct(CtkFactory $factory, array $params = array()) {
+		parent::__construct();
 		$this->_factory = $factory;
 		$this->_name = str_replace($factory->getName(), '', get_class($this));
 		$this->_inheritArrayProperties(array('_params', '_validate'));
@@ -232,20 +233,22 @@ final public function bindTo($type, CtkBindable $node) {
 	}
 
 /**
- * Loads the template for the event.
+ * Parses the template for the event.
  *
  * @param string $path Path to the template.
  * @return string
  * @throws CakeException if template is not found.
  */
-	final public function load($path) {
+	final public function template($path) {
+		if (!is_string($path)) {
+			throw new CakeException('Template path must be a string');
+		}
 		if (is_file($path) && is_readable($path)) {
 			ob_start();
 			require $path;
 			return ob_get_clean();
-		} else {
-			throw new CakeException(sprintf('Template not found: %s', $path));
 		}
+		throw new CakeException(sprintf('Template not found: %s', $path));
 	}
 
 /**

Lib/CtkNode.php

@@ -902,13 +902,13 @@ final public function clearEvents($type = null) {
 	}
 
 /**
- * Loads the template for the node.
+ * Parses the template for the node.
  *
  * @param string $path Path to the template.
  * @return string
  * @throws CakeException if template is not found.
  */
-	final public function load($path) {
+	final public function template($path) {
 		if (!is_string($path)) {
 			throw new CakeException('Template path must be a string');
 		}

View/Helper/FactoryHelper.php

@@ -106,6 +106,7 @@ public function __construct(View $View, $settings = array()) {
 			}
 			$factory = new $class($this->_view, $name, $plugin, $value);
 			$factory->setup();
+			$factory->load();
 			$property = ($isAlias)? $key : $name;
 			$this->$property = new CtkFactoryAdaptor($factory);
 		}