formatting and documentation cleanup

UnionOfRAD · Dec 17, 2009 · 8e160ac · 8e160ac
1 parent 9decac0
commit 8e160ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libraries/lithium/http/Media.php b/libraries/lithium/http/Media.php
@@ -359,7 +359,7 @@ public static function render(&$response, $data = null, $options = array()) {
 		}
 
 		if (isset(static::$_handlers[$type])) {
-			$h = (array)static::$_handlers[$type] + (array) static::$_handlers['default'];
+			$h = (array) static::$_handlers[$type] + (array) static::$_handlers['default'];
 		} else {
 			$h = $options + $defaults;
 			$filter = function($v) { return $v !== null; };

diff --git a/libraries/lithium/template/helper/Html.php b/libraries/lithium/template/helper/Html.php
@@ -322,7 +322,7 @@ function para($class, $content, $options = array()) {
 	 *
 	 * @param string $type The title of the external resource
 	 * @param mixed $url The address of the external resource or string for content attribute
-	 * @param array $attributes Other attributes for the generated tag. If the type attribute
+	 * @param array $options Other attributes for the generated tag. If the type attribute
 	 *               is 'html', 'rss', 'atom', or 'icon', the mime-type is returned.
 	 * @return string
 	 */

diff --git a/libraries/lithium/test/Controller.php b/libraries/lithium/test/Controller.php
@@ -43,7 +43,7 @@ public function __invoke($request, $params, $options = array()) {
 		$template = Libraries::locate('test.reporter.template', 'layout', array(
 			'filter' => false, 'type' => 'file', 'suffix' => '.html.php',
 		));
-		include($template);
+		include $template;
 	}
 }