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

Simplify how fullBase is calculated.

Browse source 
Using FULL_BASE_URL fixes URL generation when URL rewriting is
disabled.

Fixes #3777
This commit is contained in:
mark_story 2013-04-27 23:00:50 -04:00
parent c327bdc4bd
commit 65b1a94e63
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/Cake/Test/Case/View/HelperTest.php
View file

@ -658,6 +658,21 @@ class HelperTest extends CakeTestCase {
$this->assertEquals('foo.jpg?one=two&three=four', $result); $this->assertEquals('foo.jpg?one=two&three=four', $result);
} }
/**
* Test assetUrl with no rewriting.
*
* @return void
*/
public function testAssetUrlNoRewrite() {
$this->Helper->request->addPaths(array(
'base' => '/cake_dev/index.php',
'webroot' => '/cake_dev/app/webroot/',
'here' => '/cake_dev/index.php/tasks',
));
$result = $this->Helper->assetUrl('img/cake.icon.png', array('fullBase' => true));
$this->assertEquals('http://localhost/cake_dev/app/webroot/img/cake.icon.png', $result);
}
/** /**
* Test assetUrl with plugins. * Test assetUrl with plugins.
* *

7
lib/Cake/View/Helper.php
View file

@ -328,12 +328,7 @@ class Helper extends Object {
$path = $this->_encodeUrl($this->assetTimestamp($this->webroot($path))); $path = $this->_encodeUrl($this->assetTimestamp($this->webroot($path)));
if (!empty($options['fullBase'])) { if (!empty($options['fullBase'])) {
$base = $this->url('/', true); $path = rtrim(FULL_BASE_URL, '/') . '/' . ltrim($path, '/');
$len = strlen($this->request->webroot);
if ($len) {
$base = substr($base, 0, -$len);
}
$path = $base . $path;
} }
return $path; return $path;
} }