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

Merge remote-tracking branch 'origin/2.0' into 2.0-class-loading

Browse source
This commit is contained in:
Jose Lorenzo Rodriguez 2011-03-05 17:37:31 -04:30
commit f8a08432f4
9 changed files with 87 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/View/Helper/CacheHelper.php
View file

@ -215,8 +215,8 @@ class CacheHelper extends AppHelper {
} else {
$cacheTime = strtotime($timestamp, $now);
}
$path = $this->request->here;
if ($this->here == '/') {
$path = $this->request->here();
if ($path == '/') {
$path = 'home';
}
$cache = strtolower(Inflector::slug($path));

2
lib/Cake/View/Helper/FormHelper.php
View file

@ -241,7 +241,7 @@ class FormHelper extends AppHelper {
$this->_inputDefaults = $options['inputDefaults'];
unset($options['inputDefaults']);
if ($options['action'] === null && $options['url'] === null) {
$options['action'] = $this->request->here;
$options['action'] = $this->request->here(false);
if (!isset($options['id'])) {
$options['id'] = $this->domId($this->request['action'] . 'Form');
}