From 096bfb25652ca56482ce0ab3635ded2cd1ff88ac Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 12 Jan 2010 23:54:29 +0000 Subject: [PATCH] BUGFIX: Fix image tracking not working cross subsite (from r88008) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96782 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetTableField.php | 3 +++ javascript/LeftAndMain_right.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/AssetTableField.php b/code/AssetTableField.php index ce8cae71..44bb612a 100755 --- a/code/AssetTableField.php +++ b/code/AssetTableField.php @@ -197,7 +197,10 @@ class AssetTableField extends ComplexTableField { } if($childData && $childData->hasMethod('BackLinkTracking')) { + if(class_exists('Subsite')) Subsite::disable_subsite_filter(true); $links = $childData->BackLinkTracking(); + if(class_exists('Subsite')) Subsite::disable_subsite_filter(false); + if($links->exists()) { foreach($links as $link) { $backlinks[] = "
  • ID\">" . $link->Breadcrumbs(null,true). "
  • "; diff --git a/javascript/LeftAndMain_right.js b/javascript/LeftAndMain_right.js index ab16360a..75214ab7 100755 --- a/javascript/LeftAndMain_right.js +++ b/javascript/LeftAndMain_right.js @@ -463,4 +463,4 @@ function tinymce_removeAll() { tinymce.EditorManager.editors = {}; } -} \ No newline at end of file +}