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

Merging fixes and enhancements into trunk.

Browse source 
Revision: [2478]
Merging differences between model_php4.php and model_php5.php

git-svn-id: https://svn.cakephp.org/repo/trunk/cake@2479 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-04-11 15:55:53 +00:00
parent e3cadc0eb4
commit a95a8c0a61
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION.txt
View file

@ -6,4 +6,4 @@
// +---------------------------------------------------------------------------------------------------+ // // +---------------------------------------------------------------------------------------------------+ //
/////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////
1.0.0.2477 1.0.0.2479

9
cake/libs/model/model_php4.php
View file

@ -1215,6 +1215,15 @@ class Model extends Object
$limit_str = $db->limit($limit, $offset); $limit_str = $db->limit($limit, $offset);
} }
if ($order == null)
{
$order = array();
}
else
{
$order = array($order);
}
$queryData = array( $queryData = array(
'conditions' => $conditions, 'conditions' => $conditions,
'fields' => $fields, 'fields' => $fields,

3
cake/libs/model/model_php5.php
View file

@ -1494,7 +1494,8 @@ class Model extends Object
} }
/** /**
* Returns a resultset array with specified fields from database matching given conditions. Method can be used to generate option lists for SELECT elements. * Returns a resultset array with specified fields from database matching given conditions.
* Method can be used to generate option lists for SELECT elements.
* *
* @param mixed $conditions SQL conditions as a string or as an array('field'=>'value',...) * @param mixed $conditions SQL conditions as a string or as an array('field'=>'value',...)
* @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC") * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC")