Merge branch '4.2-dev' into patch-4

joomla · May 31, 2022 · fa76795 · fa76795
2 parents a874bc7 + bc6e6ec
commit fa76795
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 64 deletions.
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
@@ -460,7 +460,7 @@ protected function batchCopy($value, $pks, $contexts)
 		}
 
 		$newIds = array();
-		$db     = $this->getDbo();
+		$db     = $this->getDatabase();
 
 		// Parent exists so let's proceed
 		while (!empty($pks))
@@ -935,7 +935,7 @@ public function delete(&$pks)
 					// Multilanguage: if associated, delete the item in the _associations table
 					if ($this->associationsContext && Associations::isEnabled())
 					{
-						$db = $this->getDbo();
+						$db = $this->getDatabase();
 						$query = $db->getQuery(true)
 							->select(
 								[
@@ -1449,7 +1449,7 @@ public function save($data)
 			}
 
 			// Get associationskey for edited item
-			$db    = $this->getDbo();
+			$db    = $this->getDatabase();
 			$id    = (int) $table->$key;
 			$query = $db->getQuery(true)
 				->select($db->quoteName('key'))

diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
@@ -290,7 +290,7 @@ public function getItems()
 	 */
 	protected function getListQuery()
 	{
-		return $this->getDbo()->getQuery(true);
+		return $this->getDatabase()->getQuery(true);
 	}
 
 	/**

diff --git a/plugins/system/fields/fields.php b/plugins/system/fields/fields.php
@@ -14,7 +14,6 @@
 use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
-use Joomla\Component\Finder\Administrator\Indexer\Indexer;
 use Joomla\Registry\Registry;
 
 /**
@@ -502,65 +501,6 @@ public function onContentPrepare($context, $item)
 		}
 	}
 
-	/**
-	 * @param   \Joomla\Component\Finder\Administrator\Indexer\Result  $item  The item
-	 *
-	 * @return  boolean
-	 *
-	 * @since   3.7.0
-	 */
-	public function onPrepareFinderContent($item)
-	{
-		$section = strtolower($item->layout);
-		$tax     = $item->getTaxonomy('Type');
-
-		if ($tax)
-		{
-			foreach ($tax as $context => $value)
-			{
-				// This is only a guess, needs to be improved
-				$component = strtolower($context);
-
-				if (strpos($context, 'com_') !== 0)
-				{
-					$component = 'com_' . $component;
-				}
-
-				// Transform com_article to com_content
-				if ($component === 'com_article')
-				{
-					$component = 'com_content';
-				}
-
-				// Create a dummy object with the required fields
-				$tmp     = new stdClass;
-				$tmp->id = $item->__get('id');
-
-				if ($item->__get('catid'))
-				{
-					$tmp->catid = $item->__get('catid');
-				}
-
-				// Getting the fields for the constructed context
-				$fields = FieldsHelper::getFields($component . '.' . $section, $tmp, true);
-
-				if (is_array($fields))
-				{
-					foreach ($fields as $field)
-					{
-						// Adding the instructions how to handle the text
-						$item->addInstruction(Indexer::TEXT_CONTEXT, $field->name);
-
-						// Adding the field value as a field
-						$item->{$field->name} = $field->value;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
 	/**
 	 * Prepares a tag item to be ready for com_fields.
 	 *