From 16cae724175f3464d4606a6537b13ffbc30ed723 Mon Sep 17 00:00:00 2001 From: mark_story Date: Wed, 30 Jun 2010 20:23:04 -0400 Subject: [PATCH] Using App::themePath inside Dispatcher. --- cake/dispatcher.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/cake/dispatcher.php b/cake/dispatcher.php index d7363e1c646..651789d8ee9 100644 --- a/cake/dispatcher.php +++ b/cake/dispatcher.php @@ -584,14 +584,10 @@ function asset($url) { $themeName = $parts[1]; unset($parts[0], $parts[1]); $fileFragment = implode('/', $parts); - - $viewPaths = App::path('views'); - foreach ($viewPaths as $viewPath) { - $path = $viewPath . 'themed' . DS . $themeName . DS . 'webroot' . DS; - if (file_exists($path . $fileFragment)) { - $assetFile = $path . $fileFragment; - break; - } + + $path = App::themePath($themeName) . 'webroot' . DS; + if (file_exists($path . $fileFragment)) { + $assetFile = $path . $fileFragment; } } else { $plugin = $parts[0]; @@ -648,7 +644,6 @@ function _deliverAsset($assetFile, $ext) { include($assetFile); } else { ob_clean(); - flush(); readfile($assetFile); }