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

Adding fix for Ticket #896

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3108 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-06-15 13:18:01 +00:00
parent ae3a8d0f9e
commit 14d5d8e979
2 changed files with 38 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,6 +240,13 @@ class Model extends Object{
*/
var $recursive = 1;
/**
* Default ordering of model records
*
* @var mixed
*/
var $order = null;
/**
* Default association keys
*
@ -1109,17 +1116,22 @@ class Model extends Object{
}
if ($order == null) {
$order = array();
if ($this->order == null) {
$order = array();
} else {
$order = array($this->order);
}
} else {
$order = array($order);
}
$queryData = array('conditions' => $conditions,
'fields' => $fields,
'joins' => array(),
'limit' => $limit,
'offset' => $offset,
'order' => $order
$queryData = array(
'conditions' => $conditions,
'fields' => $fields,
'joins' => array(),
'limit' => $limit,
'offset' => $offset,
'order' => $order
);
if (!$this->beforeFind($queryData)) {

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

@ -240,6 +240,13 @@ class Model extends Object{
*/
var $recursive = 1;
/**
* Default ordering of model records
*
* @var mixed
*/
var $order = null;
/**
* Default association keys
*
@ -1106,17 +1113,22 @@ class Model extends Object{
}
if ($order == null) {
$order = array();
if ($this->order == null) {
$order = array();
} else {
$order = array($this->order);
}
} else {
$order = array($order);
}
$queryData = array('conditions' => $conditions,
'fields' => $fields,
'joins' => array(),
'limit' => $limit,
'offset' => $offset,
'order' => $order
$queryData = array(
'conditions' => $conditions,
'fields' => $fields,
'joins' => array(),
'limit' => $limit,
'offset' => $offset,
'order' => $order
);
if (!$this->beforeFind($queryData)) {