diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php index cc59edbb3cd..8eab41468f0 100644 --- a/lib/Cake/Model/Datasource/DboSource.php +++ b/lib/Cake/Model/Datasource/DboSource.php @@ -913,7 +913,7 @@ public function name($data) { ) ); } - if (preg_match('/^[\w-_\s]*[\w-_]+/', $data)) { + if (preg_match('/^[\w\-_\s]*[\w\-_]+/', $data)) { return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote); } return $this->cacheMethod(__FUNCTION__, $cacheKey, $data); diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php index 21dfd7b2e5b..cae6b34a50d 100644 --- a/lib/Cake/Network/CakeResponse.php +++ b/lib/Cake/Network/CakeResponse.php @@ -1164,9 +1164,13 @@ public function checkNotModified(CakeRequest $request) { $modifiedSince = $request->header('If-Modified-Since'); if ($responseTag = $this->etag()) { $etagMatches = in_array('*', $etags) || in_array($responseTag, $etags); + } else { + $etagMatches = false; } if ($modifiedSince) { $timeMatches = strtotime($this->modified()) === strtotime($modifiedSince); + } else { + $timeMatches = false; } $checks = compact('etagMatches', 'timeMatches'); if (empty($checks)) { diff --git a/lib/Cake/Utility/ObjectCollection.php b/lib/Cake/Utility/ObjectCollection.php index 460ca86d05c..77e4ad234e4 100644 --- a/lib/Cake/Utility/ObjectCollection.php +++ b/lib/Cake/Utility/ObjectCollection.php @@ -95,6 +95,7 @@ public function trigger($callback, $params = array(), $options = array()) { if (empty($this->_enabled)) { return true; } + $subject = null; if ($callback instanceof CakeEvent) { $event = $callback; if (is_array($event->data)) { diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php index 8a15e1d7a67..141bde6562f 100644 --- a/lib/Cake/View/Helper/FormHelper.php +++ b/lib/Cake/View/Helper/FormHelper.php @@ -1060,6 +1060,8 @@ public function input($fieldName, $options = array()) { if ($options['type'] === 'radio' && isset($options['options'])) { $radioOptions = (array)$options['options']; unset($options['options']); + } else { + $radioOptions = []; } $label = $this->_getLabel($fieldName, $options); @@ -1080,6 +1082,9 @@ public function input($fieldName, $options = array()) { $dateFormat = $this->_extractOption('dateFormat', $options, 'MDY'); $timeFormat = $this->_extractOption('timeFormat', $options, 12); unset($options['dateFormat'], $options['timeFormat']); + } else { + $dateFormat = 'MDY'; + $timeFormat = 12; } $type = $options['type'];