From 37afb369c3f2069cf72fd3d0293448c6d6e9129b Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Thu, 28 Nov 2013 11:46:32 +0100 Subject: [PATCH] // Fix already defined Core class --- controllers/admin/AdminTranslationsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php index 3bdfe74d0..597287ec8 100644 --- a/controllers/admin/AdminTranslationsController.php +++ b/controllers/admin/AdminTranslationsController.php @@ -2097,7 +2097,7 @@ class AdminTranslationsControllerCore extends AdminController $class_name = substr($file, 0, -4); - if (!class_exists($class_name, false)) + if (!class_exists($class_name, false) && !class_exists($class_name.'Core', false)) Autoload::getInstance()->load($class_name); if (!is_subclass_of($class_name.'Core', 'ObjectModel'))