From 14d5d8e979b97f74821f07584805cd50ed4cccd3 Mon Sep 17 00:00:00 2001
From: nate <nate@cakephp.org>
Date: Thu, 15 Jun 2006 13:18:01 +0000
Subject: [PATCH] Adding fix for Ticket #896

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3108 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/model/model_php4.php | 26 +++++++++++++++++++-------
 cake/libs/model/model_php5.php | 26 +++++++++++++++++++-------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/cake/libs/model/model_php4.php b/cake/libs/model/model_php4.php
index cb81eeb09..56c154c6c 100644
--- a/cake/libs/model/model_php4.php
+++ b/cake/libs/model/model_php4.php
@@ -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)) {
diff --git a/cake/libs/model/model_php5.php b/cake/libs/model/model_php5.php
index 53992bb7e..b60e9f36f 100644
--- a/cake/libs/model/model_php5.php
+++ b/cake/libs/model/model_php5.php
@@ -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)) {