Merge branch '4.0-dev' into dashboard

joomla · Dec 29, 2019 · 341dc6b · 341dc6b
2 parents e1cc4ae + 370fad5
commit 341dc6b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/administrator/components/com_mails/Model/TemplateModel.php b/administrator/components/com_mails/Model/TemplateModel.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\MVC\Model\AdminModel;
 use Joomla\CMS\Object\CMSObject;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 use Joomla\Registry\Registry;
 use Joomla\Utilities\ArrayHelper;
@@ -286,7 +287,7 @@ public function save($data)
 		$isNew = true;
 
 		// Include the plugins for the save events.
-		\JPluginHelper::importPlugin($this->events_map['save']);
+		PluginHelper::importPlugin($this->events_map['save']);
 
 		// Allow an exception to be thrown.
 		try

diff --git a/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php b/plugins/captcha/recaptcha_invisible/recaptcha_invisible.php
@@ -13,14 +13,15 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Utilities\IpHelper;
 
 /**
  * Invisible reCAPTCHA Plugin.
  *
  * @since  3.9.0
  */
-class PlgCaptchaRecaptcha_Invisible extends \JPlugin
+class PlgCaptchaRecaptcha_Invisible extends CMSPlugin
 {
 	/**
 	 * Load the language file on instantiation.

diff --git a/plugins/system/logrotation/logrotation.php b/plugins/system/logrotation/logrotation.php
@@ -9,7 +9,9 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Cache\Cache;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Plugin\CMSPlugin;
 use Joomla\Filesystem\File;
 use Joomla\Filesystem\Folder;
 use Joomla\Filesystem\Path;
@@ -21,7 +23,7 @@
  *
  * @since  3.9.0
  */
-class PlgSystemLogrotation extends JPlugin
+class PlgSystemLogrotation extends CMSPlugin
 {
 	/**
 	 * Load the language file on instantiation.
@@ -264,7 +266,7 @@ private function clearCacheGroups(array $clearGroups, array $cacheClients = arra
 							$conf->get('cache_path', JPATH_SITE . '/cache')
 					);
 
-					$cache = JCache::getInstance('callback', $options);
+					$cache = Cache::getInstance('callback', $options);
 					$cache->clean();
 				}
 				catch (Exception $e)

diff --git a/plugins/system/privacyconsent/privacyconsent.php b/plugins/system/privacyconsent/privacyconsent.php
@@ -10,6 +10,7 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Cache\Cache;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\Form;
 use Joomla\CMS\Form\FormHelper;
@@ -751,7 +752,7 @@ private function clearCacheGroups(array $clearGroups, array $cacheClients = [0,
 							$conf->get('cache_path', JPATH_SITE . '/cache')
 					];
 
-					$cache = JCache::getInstance('callback', $options);
+					$cache = Cache::getInstance('callback', $options);
 					$cache->clean();
 				}
 				catch (Exception $e)