Check the table existence in the page and file picker (see #7346)

contao · Oct 3, 2014 · 2b76ffa · 2b76ffa
1 parent 9c272cc
commit 2b76ffa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/system/modules/core/controllers/BackendFile.php b/system/modules/core/controllers/BackendFile.php
@@ -81,12 +81,15 @@ public function run()
 		$objDca->field = $strField;
 
 		// Set the active record
-		$strModel = \Model::getClassFromTable($strTable);
-		$objModel = $strModel::findByPk(\Input::get('id'));
-
-		if ($objModel !== null)
+		if ($this->Database->tableExists($strTable))
 		{
-			$objDca->activeRecord = $objModel;
+			$strModel = \Model::getClassFromTable($strTable);
+			$objModel = $strModel::findByPk(\Input::get('id'));
+
+			if ($objModel !== null)
+			{
+				$objDca->activeRecord = $objModel;
+			}
 		}
 
 		// AJAX request

diff --git a/system/modules/core/controllers/BackendPage.php b/system/modules/core/controllers/BackendPage.php
@@ -81,12 +81,15 @@ public function run()
 		$objDca->field = $strField;
 
 		// Set the active record
-		$strModel = \Model::getClassFromTable($strTable);
-		$objModel = $strModel::findByPk(\Input::get('id'));
-
-		if ($objModel !== null)
+		if ($this->Database->tableExists($strTable))
 		{
-			$objDca->activeRecord = $objModel;
+			$strModel = \Model::getClassFromTable($strTable);
+			$objModel = $strModel::findByPk(\Input::get('id'));
+
+			if ($objModel !== null)
+			{
+				$objDca->activeRecord = $objModel;
+			}
 		}
 
 		// AJAX request