Permalink
Browse files

1.3 fix

  • Loading branch information...
Matt Curry
Matt Curry committed Apr 22, 2010
1 parent 91bf04a commit ea1105e9f42b57e3b122f5d01930521a75d88da8
Showing with 5 additions and 1 deletion.
  1. +5 −1 views/helpers/asset.php
View
@@ -303,7 +303,11 @@ function __findFile(&$asset, $type) {
}
}
- $paths = array_merge($paths, Configure::read('vendorPaths'));
+ $vendorPaths = Configure::read('vendorPaths');
+ if($vendorPaths) {
+ $paths = array_merge($paths, $vendorPaths);
+ }
+
$assetFile = '';
foreach ($paths as $path) {
$script = sprintf('%s.%s', $asset['script'], $type);

2 comments on commit ea1105e

@kvz

This comment has been minimized.

Show comment Hide comment
@kvz

kvz Oct 13, 2010

Hey Matt,

First of all, thanks for this plugin, I've been using it for a while now and it is awesome.
Second, may I propose the following fix instead?

$paths = array_merge($paths, App::path('vendors'));

Cheers!

kvz replied Oct 13, 2010

Hey Matt,

First of all, thanks for this plugin, I've been using it for a while now and it is awesome.
Second, may I propose the following fix instead?

$paths = array_merge($paths, App::path('vendors'));

Cheers!

@mcurry

This comment has been minimized.

Show comment Hide comment
@mcurry

mcurry Oct 22, 2010

Owner

I actually pulled that section in the latest. I didn't think it still applies for Cake 1.3?

I did change the part that pulls the plugin paths to use App:path(). Thanks - I didn't know about that function.

Owner

mcurry replied Oct 22, 2010

I actually pulled that section in the latest. I didn't think it still applies for Cake 1.3?

I did change the part that pulls the plugin paths to use App:path(). Thanks - I didn't know about that function.

Please sign in to comment.