From c50a9c59ec7651f29ded2e086b7c68fb567b26b7 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 30 Sep 2015 21:06:14 +1000
Subject: [PATCH] Add missing disable_column_alias in ORM

---
 modules/orm/classes/Kohana/ORM.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/orm/classes/Kohana/ORM.php b/modules/orm/classes/Kohana/ORM.php
index 3416d34..646a21f 100644
--- a/modules/orm/classes/Kohana/ORM.php
+++ b/modules/orm/classes/Kohana/ORM.php
@@ -1063,7 +1063,7 @@ class Kohana_ORM extends Model implements serializable {
 
 		foreach ($this->_table_columns as $column => $_)
 		{
-			$columns[] = array($this->_object_name.'.'.$column, $column);
+			$columns[] = $this->_disable_column_alias ? $column : array($this->_object_name.'.'.$column, $column);
 		}
 
 		return $columns;