From c55b018feb0f89541f1524ba2a744f0b992c6eef Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian.mooyman@gmail.com>
Date: Fri, 10 Aug 2012 13:54:29 +1200
Subject: [PATCH] FIXED: Issue where versioned would join _versions tables on
 ID,Version instead of RecordID,Version

---
 model/Versioned.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/model/Versioned.php b/model/Versioned.php
index 151810f62..a78d46af4 100644
--- a/model/Versioned.php
+++ b/model/Versioned.php
@@ -145,7 +145,8 @@ class Versioned extends DataExtension {
 			$date = $dataQuery->getQueryParam('Versioned.date');
 			foreach($query->getFrom() as $table => $dummy) {
 				$query->renameTable($table, $table . '_versions');
-				$query->replaceText("\"$table\".\"ID\"", "\"$table\".\"RecordID\"");
+				$query->replaceText("\"{$table}_versions\".\"ID\"", "\"{$table}_versions\".\"RecordID\"");
+				$query->replaceText("`{$table}_versions`.`ID`", "`{$table}_versions`.`RecordID`");
 				
 				// Add all <basetable>_versions columns
 				foreach(self::$db_for_versions_table as $name => $type) {