Permalink
Browse files

Fixing parse error in php4 for MediaView. Also fixing undefined varia…

…ble error in Dispatcher. Fixes #628
  • Loading branch information...
1 parent 56967e7 commit bb239e3816263b1bac72786a272fa5794562bc27 @markstory markstory committed Apr 28, 2010
Showing with 2 additions and 1 deletion.
  1. +1 −0 cake/dispatcher.php
  2. +1 −1 cake/libs/view/media.php
View
@@ -620,6 +620,7 @@ function _deliverAsset($assetFile, $ext) {
}
App::import('View', 'Media', false);
+ $controller = null;
$Media = new MediaView($controller);
if (isset($Media->mimeType[$ext])) {
$contentType = $Media->mimeType[$ext];
View
@@ -95,7 +95,7 @@ class MediaView extends View {
*
* @param object $controller
*/
- function __construct(&$controller = null) {
+ function __construct(&$controller) {
parent::__construct($controller);
}

0 comments on commit bb239e3

Please sign in to comment.