mirror of
https://github.com/silverstripe/silverstripe-subsites
synced 2024-10-22 11:05:55 +02:00
BUG Fixing FileSubsites failing when deleting ImageTracking
This commit is contained in:
parent
3d59f10331
commit
cac77703ed
@ -46,9 +46,12 @@ class FileSubsites extends DataExtension {
|
||||
function augmentSQL(SQLQuery &$query) {
|
||||
// If you're querying by ID, ignore the sub-site - this is a bit ugly... (but it was WAYYYYYYYYY worse)
|
||||
//@TODO I don't think excluding if SiteTree_ImageTracking is a good idea however because of the SS 3.0 api and ManyManyList::removeAll() changing the from table after this function is called there isn't much of a choice
|
||||
if(array_search('SiteTree_ImageTracking', $query->getFrom())===false && (!$query->where || !preg_match('/\.(\'|"|`|)ID(\'|"|`|)/', $query->where[0]))) {
|
||||
/*if($context = DataObject::context_obj()) $subsiteID = (int) $context->SubsiteID;
|
||||
else */$subsiteID = (int) Subsite::currentSubsiteID();
|
||||
|
||||
$from = $query->getFrom();
|
||||
$where = $query->getWhere();
|
||||
|
||||
if(!isset($from['SiteTree_ImageTracking']) && !($where && preg_match('/\.(\'|"|`|)ID(\'|"|`|)/', $where[0]))) {
|
||||
$subsiteID = (int) Subsite::currentSubsiteID();
|
||||
|
||||
// The foreach is an ugly way of getting the first key :-)
|
||||
foreach($query->getFrom() as $tableName => $info) {
|
||||
|
Loading…
Reference in New Issue
Block a user