From 94edb694b71e1625ba8eb755e03ff798d9f71b58 Mon Sep 17 00:00:00 2001
From: John Milmine <john.milmine@dna.co.nz>
Date: Thu, 12 Feb 2015 08:14:49 +1300
Subject: [PATCH] redoing bugfix 7b11e979fad46e5493ced136749e5620c6d30997
 removed by cac77703

---
 code/extensions/FileSubsites.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/extensions/FileSubsites.php b/code/extensions/FileSubsites.php
index 6c898df..3ede9bf 100644
--- a/code/extensions/FileSubsites.php
+++ b/code/extensions/FileSubsites.php
@@ -66,7 +66,7 @@ class FileSubsites extends DataExtension {
 		$from = $query->getFrom();
 		$where = $query->getWhere();
 
-		if(!isset($from['SiteTree_ImageTracking']) && !($where && preg_match('/\.(\'|"|`|)ID(\'|"|`|)/', $where[0]))) {
+		if(!isset($from['SiteTree_ImageTracking']) && !($where && preg_match('/\.(\'|"|`|)ID(\'|"|`|)/', implode(' ', $where)))) {
 			$subsiteID = (int) Subsite::currentSubsiteID();
 
 			// The foreach is an ugly way of getting the first key :-)