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

Minor optimization in DboSource::__scrubQueryData(), removing unneded isset() check.

Browse source
This commit is contained in:
ADmad 2010-03-18 03:02:58 +05:30
parent 6a723bb515
commit e2113e4aa2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/libs/model/datasources/dbo_source.php
View file

@ -532,12 +532,12 @@ class DboSource extends DataSource {
return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote); return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
} }
$items = explode('.', $data); $items = explode('.', $data);
return $this->cacheMethod(__FUNCTION__, $cacheKey, return $this->cacheMethod(__FUNCTION__, $cacheKey,
$this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote $this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote
); );
} }
if (preg_match('/^[\w-]+\.\*$/', $data)) { // string.* if (preg_match('/^[\w-]+\.\*$/', $data)) { // string.*
return $this->cacheMethod(__FUNCTION__, $cacheKey, return $this->cacheMethod(__FUNCTION__, $cacheKey,
$this->startQuote . str_replace('.*', $this->endQuote . '.*', $data) $this->startQuote . str_replace('.*', $this->endQuote . '.*', $data)
); );
} }
@ -1884,7 +1884,7 @@ class DboSource extends DataSource {
*/ */
function __scrubQueryData($data) { function __scrubQueryData($data) {
foreach (array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group') as $key) { foreach (array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group') as $key) {
if (!isset($data[$key]) || empty($data[$key])) { if (empty($data[$key])) {
$data[$key] = array(); $data[$key] = array();
} }
} }