From f64561e1b40fba7c9517280096d42ddfd9eb0e60 Mon Sep 17 00:00:00 2001 From: Raissa North Date: Tue, 9 Jan 2018 09:30:20 +1300 Subject: [PATCH] API Remove Translatable compatibility logic --- .../ContentReviewCompatability.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/Compatibility/ContentReviewCompatability.php b/src/Compatibility/ContentReviewCompatability.php index 3d41dd0..ed5a0c8 100644 --- a/src/Compatibility/ContentReviewCompatability.php +++ b/src/Compatibility/ContentReviewCompatability.php @@ -4,13 +4,10 @@ namespace SilverStripe\ContentReview\Compatibility; use SilverStripe\Core\ClassInfo; use SilverStripe\Subsites\Model\Subsite; -use Translatable; - -// @todo add translatable namespace /** * This is a helper class which lets us do things with content review data without subsites - * and translatable messing our SQL queries up. + * messing our SQL queries up. * * Make sure any DataQuery instances you are building are BOTH created & executed between start() * and done() because augmentDataQueryCreate and augmentSQL happens there. @@ -19,8 +16,6 @@ class ContentReviewCompatability { const SUBSITES = 0; - const TRANSLATABLE = 1; - /** * Returns the state of other modules before compatibility mode is started. * @@ -29,8 +24,7 @@ class ContentReviewCompatability public static function start() { $compatibility = [ - self::SUBSITES => null, - self::TRANSLATABLE => null, + self::SUBSITES => null, ]; if (ClassInfo::exists(Subsite::class)) { @@ -38,11 +32,6 @@ class ContentReviewCompatability Subsite::disable_subsite_filter(true); } - if (ClassInfo::exists(Translatable::class)) { - $compatibility[self::TRANSLATABLE] = Translatable::locale_filter_enabled(); - Translatable::disable_locale_filter(); - } - return $compatibility; } @@ -54,9 +43,5 @@ class ContentReviewCompatability if (class_exists(Subsite::class)) { Subsite::$disable_subsite_filter = $compatibility[self::SUBSITES]; } - - if (class_exists(Translatable::class)) { - Translatable::enable_locale_filter($compatibility[self::TRANSLATABLE]); - } } }