Only load the model in the file/page picker if the class exists (see #…

…7490)
contao · Jan 16, 2015 · 903fc0d · 903fc0d
1 parent 994f803
commit 903fc0d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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;
+				}
 			}
 		}