adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect exception type when double slash paths are used.

Browse source 
Fixes #3838
This commit is contained in:
mark_story 2013-05-18 12:19:35 -04:00
parent e23c4ffad9
commit f8c6138ad7
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Routing/Filter/AssetDispatcher.php
View file

@ -124,7 +124,7 @@ class AssetDispatcher extends DispatcherFilter {
} }
$plugin = Inflector::camelize($parts[0]); $plugin = Inflector::camelize($parts[0]);
if (CakePlugin::loaded($plugin)) { if ($plugin && CakePlugin::loaded($plugin)) {
unset($parts[0]); unset($parts[0]);
$fileFragment = urldecode(implode(DS, $parts)); $fileFragment = urldecode(implode(DS, $parts));
$pluginWebroot = CakePlugin::path($plugin) . 'webroot' . DS; $pluginWebroot = CakePlugin::path($plugin) . 'webroot' . DS;

17
lib/Cake/Test/Case/Routing/Filter/AssetDispatcherTest.php
View file

@ -121,4 +121,21 @@ class AssetDispatcherTest extends CakeTestCase {
$this->assertSame($response, $filter->beforeDispatch($event)); $this->assertSame($response, $filter->beforeDispatch($event));
$this->assertEquals($time->format('D, j M Y H:i:s') . ' GMT', $response->modified()); $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());
}
} }