adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-03 10:02:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/2.1' into 2.2

Browse source 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
This commit is contained in:
Jose Lorenzo Rodriguez 2012-06-06 11:06:06 -04:30
commit 51635c2ca6
9 changed files with 87 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -313,6 +313,9 @@ class Helper extends Object {
$path = h($this->assetTimestamp($this->webroot($path)));
if (!empty($options['fullBase'])) {
if ($path[0] == '/') {
$path = substr($path, 1);
}
$path = $this->url('/', true) . $path;
}
}