adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-06-01 12:23:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	lib/Cake/Model/ConnectionManager.php
	lib/Cake/basics.php
This commit is contained in:
José Lorenzo Rodríguez 2010-12-05 23:43:58 -04:30
commit 3f64844de9
97 changed files with 827 additions and 438 deletions
lib/Cake/Model/Datasource/Database
Mssql.php

10
lib/Cake/Model/Datasource/Database/Mssql.php
View file

@ -227,7 +227,7 @@ class DboMssql extends DboSource {
* @param Model $model Model object to describe
* @return array Fields in table. Keys are name and type
*/
function describe(&$model) {
function describe($model) {
$cache = parent::describe($model);
if ($cache != null) {
@ -317,7 +317,7 @@ class DboMssql extends DboSource {
* @param mixed $fields
* @return array
*/
function fields(&$model, $alias = null, $fields = array(), $quote = true) {
function fields($model, $alias = null, $fields = array(), $quote = true) {
if (empty($alias)) {
$alias = $model->alias;
}
@ -383,7 +383,7 @@ class DboMssql extends DboSource {
* @param mixed $conditions
* @return array
*/
function create(&$model, $fields = null, $values = null) {
function create($model, $fields = null, $values = null) {
if (!empty($values)) {
$fields = array_combine($fields, $values);
}
@ -413,7 +413,7 @@ class DboMssql extends DboSource {
* @param mixed $conditions
* @return array
*/
function update(&$model, $fields = array(), $values = null, $conditions = null) {
function update($model, $fields = array(), $values = null, $conditions = null) {
if (!empty($values)) {
$fields = array_combine($fields, $values);
}
@ -667,7 +667,7 @@ class DboMssql extends DboSource {
* @param boolean $cache Enables returning/storing cached query results
* @return array Array of resultset rows, or false if no rows matched
*/
function read(&$model, $queryData = array(), $recursive = null) {
function read($model, $queryData = array(), $recursive = null) {
$results = parent::read($model, $queryData, $recursive);
$this->__fieldMappings = array();
return $results;