Permalink
Browse files

Update doc block and remove inline assignment.

  • Loading branch information...
1 parent bd8f6e3 commit a098ff28b8664a1c4c25445ac4a81e6660969903 @markstory markstory committed Oct 29, 2013
Showing with 3 additions and 2 deletions.
  1. +1 −1 lib/Cake/Model/Datasource/Database/Sqlserver.php
  2. +2 −1 lib/Cake/Model/Datasource/DboSource.php
@@ -599,7 +599,7 @@ public function value($data, $column = null) {
* @param Model $model
* @param array $queryData
* @param integer $recursive
- * @return array Array of resultset rows, or false if no rows matched
+ * @return array|false Array of resultset rows, or false if no rows matched
*/
public function read(Model $model, $queryData = array(), $recursive = null) {
$results = parent::read($model, $queryData, $recursive);
@@ -663,7 +663,8 @@ public function fetchAll($sql, $params = array(), $options = array()) {
if ($cache && ($cached = $this->getQueryCache($sql, $params)) !== false) {
return $cached;
}
- if ($result = $this->execute($sql, array(), $params)) {
+ $result = $this->execute($sql, array(), $params);
+ if ($result) {
$out = array();
if ($this->hasResult()) {

0 comments on commit a098ff2

Please sign in to comment.