From 903fc0db1cffe808f4fd41c1acf5bc1001718307 Mon Sep 17 00:00:00 2001 From: Leo Feyer Date: Fri, 16 Jan 2015 12:48:09 +0100 Subject: [PATCH] Only load the model in the file/page picker if the class exists (see #7490) --- system/docs/CHANGELOG.md | 7 +++++++ system/modules/core/controllers/BackendFile.php | 10 +++++++--- system/modules/core/controllers/BackendPage.php | 10 +++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md index 0ed412eca5..f68fcabef3 100644 --- a/system/docs/CHANGELOG.md +++ b/system/docs/CHANGELOG.md @@ -1,6 +1,13 @@ Contao Open Source CMS changelog ================================ +Version 3.4.1 (2015-01-XX) +-------------------------- + +### Fixed +Only load the model in the file/page picker if the class exists (see #7490). + + Version 3.4.0 (2014-11-25) -------------------------- diff --git a/system/modules/core/controllers/BackendFile.php b/system/modules/core/controllers/BackendFile.php index 9df4f1beff..90b2132743 100644 --- a/system/modules/core/controllers/BackendFile.php +++ b/system/modules/core/controllers/BackendFile.php @@ -84,11 +84,15 @@ public function run() if ($this->Database->tableExists($strTable)) { $strModel = \Model::getClassFromTable($strTable); - $objModel = $strModel::findByPk(\Input::get('id')); - if ($objModel !== null) + if (class_exists($strModel)) { - $objDca->activeRecord = $objModel; + $objModel = $strModel::findByPk(\Input::get('id')); + + if ($objModel !== null) + { + $objDca->activeRecord = $objModel; + } } } diff --git a/system/modules/core/controllers/BackendPage.php b/system/modules/core/controllers/BackendPage.php index 3323ea7b77..34e1b9169c 100644 --- a/system/modules/core/controllers/BackendPage.php +++ b/system/modules/core/controllers/BackendPage.php @@ -84,11 +84,15 @@ public function run() if ($this->Database->tableExists($strTable)) { $strModel = \Model::getClassFromTable($strTable); - $objModel = $strModel::findByPk(\Input::get('id')); - if ($objModel !== null) + if (class_exists($strModel)) { - $objDca->activeRecord = $objModel; + $objModel = $strModel::findByPk(\Input::get('id')); + + if ($objModel !== null) + { + $objDca->activeRecord = $objModel; + } } }