Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch '1.3' of code.cakephp.org:cakephp into 1.3

  • Loading branch information...
commit 21d2226f75f33ae1b10efa2f8f6e9bfd3ba62775 2 parents 903a1fd + f9204eb
@phpnut phpnut authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 cake/dispatcher.php
View
7 cake/dispatcher.php
@@ -611,8 +611,9 @@ function cached($url) {
App::import('View', 'Media', false);
$Media = new MediaView();
$ext = array_pop(explode('.', $url));
-
+
if (isset($Media->mimeType[$ext])) {
+ $pos = 0;
$parts = explode('/', $url);
if ($parts[0] === 'css' || $parts[0] === 'js' || $parts[0] === 'img') {
$pos = 0;
@@ -638,10 +639,10 @@ function cached($url) {
if (strpos($plugin, '/') !== false) {
list($plugin, $theme) = explode('/', $plugin);
$themePaths = App::path('views');
-
+
foreach ($themePaths as $viewPath) {
$path = $viewPath . 'themed' . DS . $theme . DS . 'webroot' . DS;
-
+
if ($plugin === 'theme' && (is_file($path . $url) && file_exists($path . $url))) {
$assetFile = $path . $url;
$matched = true;
Please sign in to comment.
Something went wrong with that request. Please try again.