Merge pull request #45903 from Bodge-IT/upmerges/2025-08-13

[6.0] Upmerges - 2025-08-13 2nd attempt

Author: richard67

administrator/components/com_banners/src/View/Banner/HtmlView.php

@@ -142,7 +142,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('banner.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_banners.banner', $this->item->id);
             }
         }

administrator/components/com_banners/src/View/Client/HtmlView.php

@@ -151,7 +151,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $isNew) {
         } else {
             $toolbar->cancel('client.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_banners.client', $this->item->id);
             }
         }

administrator/components/com_contact/src/View/Contact/HtmlView.php

@@ -200,7 +200,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
 
             $toolbar->cancel('contact.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 $toolbar->versions('com_contact.contact', $this->item->id);
             }
 

administrator/components/com_content/src/View/Article/HtmlView.php

@@ -230,7 +230,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo, $user) {
             $toolbar->cancel('article.cancel', 'JTOOLBAR_CLOSE');
 
             if (!$isNew) {
-                if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+                if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                     $toolbar->versions('com_content.article', $this->item->id);
                 }
 

administrator/components/com_contenthistory/src/View/History/HtmlView.php

@@ -105,7 +105,7 @@ protected function addToolbar(): Toolbar
 
         // Clean up input to ensure a clean url.
         $filter     = InputFilter::getInstance();
-        $aliasArray = explode('.', $this->state->item_id);
+        $aliasArray = explode('.', $this->state->get('item_id'));
 
         if ($aliasArray[1] === 'category') {
             $option = 'com_categories';

administrator/components/com_fields/src/Plugin/FieldsPlugin.php

@@ -45,6 +45,8 @@ abstract class FieldsPlugin extends CMSPlugin
      *
      * @var    \Joomla\CMS\Application\CMSApplication
      * @since  4.0.0
+     *
+     * @deprecated  __DEPLOY_VERSION__ will be removed in 7.0 use $this->getApplication() instead
      */
     protected $app;
 
@@ -138,6 +140,7 @@ public function onCustomFieldsGetTypes()
             return $types_cache[$this->_type . $this->_name];
         }
 
+        $app   = $this->getApplication() ?: $this->app;
         $types = [];
 
         // The root of the plugin
@@ -160,11 +163,11 @@ public function onCustomFieldsGetTypes()
             // Needed attributes
             $data['type'] = $layout;
 
-            if ($this->app->getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL')) {
+            if ($app->getLanguage()->hasKey('PLG_FIELDS_' . $key . '_LABEL')) {
                 $data['label'] = Text::sprintf('PLG_FIELDS_' . $key . '_LABEL', strtolower($key));
 
                 // Fix wrongly set parentheses in RTL languages
-                if ($this->app->getLanguage()->isRtl()) {
+                if ($app->getLanguage()->isRtl()) {
                     $data['label'] .= '‎';
                 }
             } else {

administrator/components/com_finder/src/View/Searches/HtmlView.php

@@ -112,7 +112,7 @@ public function display($tpl = null)
         $this->state         = $model->getState();
         $this->filterForm    = $model->getFilterForm();
         $this->activeFilters = $model->getActiveFilters();
-        $this->enabled       = $this->state->params->get('gather_search_statistics', 0);
+        $this->enabled       = $this->state->get('params')->get('gather_search_statistics', 0);
         $this->canDo         = ContentHelper::getActions('com_finder');
         $uri                 = Uri::getInstance();
         $link                = 'index.php?option=com_config&view=component&component=com_finder&return=' . base64_encode($uri);

administrator/components/com_newsfeeds/src/View/Newsfeed/HtmlView.php

@@ -178,7 +178,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('newsfeed.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_newsfeeds.newsfeed', $this->item->id);
             }
         }

administrator/components/com_tags/src/View/Tag/HtmlView.php

@@ -173,7 +173,7 @@ function (Toolbar $childBar) use ($checkedOut, $itemEditable, $canDo) {
 
             $toolbar->cancel('tag.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $itemEditable) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $itemEditable) {
                 $toolbar->versions('com_tags.tag', $this->item->id);
             }
         }

administrator/components/com_users/src/View/Note/HtmlView.php

@@ -142,7 +142,7 @@ function (Toolbar $childBar) use ($checkedOut, $canDo, $user, $isNew) {
         } else {
             $toolbar->cancel('note.cancel');
 
-            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->params->get('save_history', 0) && $canDo->get('core.edit')) {
+            if (ComponentHelper::isEnabled('com_contenthistory') && $this->state->get('params')->get('save_history', 0) && $canDo->get('core.edit')) {
                 $toolbar->versions('com_users.note', $this->item->id);
             }
         }