Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix incorrect exception type when double slash paths are used.
Fixes #3838
  • Loading branch information
markstory committed May 18, 2013
1 parent e23c4ff commit f8c6138
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/Cake/Routing/Filter/AssetDispatcher.php
Expand Up @@ -124,7 +124,7 @@ protected function _getAssetFile($url) {
}

$plugin = Inflector::camelize($parts[0]);
if (CakePlugin::loaded($plugin)) {
if ($plugin && CakePlugin::loaded($plugin)) {
unset($parts[0]);
$fileFragment = urldecode(implode(DS, $parts));
$pluginWebroot = CakePlugin::path($plugin) . 'webroot' . DS;
Expand Down
17 changes: 17 additions & 0 deletions lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
Expand Up @@ -121,4 +121,21 @@ public function testNotModified() {
$this->assertSame($response, $filter->beforeDispatch($event));
$this->assertEquals($time->format('D, j M Y H:i:s') . ' GMT', $response->modified());
}

/**
* Test that no exceptions are thrown for //index.php type urls.
*
* @return void
*/
public function test404OnDoubleSlash() {
$filter = new AssetDispatcher();

$response = $this->getMock('CakeResponse', array('_sendHeader'));
$request = new CakeRequest('//index.php');
$event = new CakeEvent('Dispatcher.beforeRequest', $this, compact('request', 'response'));

$this->assertNull($filter->beforeDispatch($event));
$this->assertFalse($event->isStopped());
}

}

0 comments on commit f8c6138

Please sign in to comment.