From 249284e4880e6a0ecad9a051854f5fe9eab94f8f Mon Sep 17 00:00:00 2001
From: Sven Slootweg <jamsoftgamedev@gmail.com>
Date: Thu, 17 Jan 2013 10:23:53 +0100
Subject: [PATCH] Always return an array from CreateFromQuery unless
 specifically the first result is requested

---
 class.databaserecord.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/class.databaserecord.php b/class.databaserecord.php
index a8139c5..c954061 100644
--- a/class.databaserecord.php
+++ b/class.databaserecord.php
@@ -619,10 +619,14 @@ abstract class CPHPDatabaseRecordClass extends CPHPBaseClass
 		
 		if($result)
 		{
-			if(count($result->data) == 1 || $first_only === true)
+			if($first_only === true)
 			{
 				return new static($result);
 			}
+			elseif(count($result->data) == 1)
+			{
+				return array(new static($result));
+			}
 			else
 			{
 				$result_array = array();