Merge branch '4.3-dev' into 4.4-dev

administrator/components/com_categories/src/Dispatcher/Dispatcher.php

@@ -31,11 +31,8 @@ class Dispatcher extends ComponentDispatcher
      */
     protected function checkAccess()
     {
-        $extension = empty($this->getApplication()->getInput()->getCmd('extension'))
-                    ? ''
-                    : $this->getApplication()->getInput()->getCmd('extension');
-
-        $parts = explode('.', $extension);
+        $extension = $this->getApplication()->getInput()->getCmd('extension', '');
+        $parts     = explode('.', $extension);
 
         // Check the user has permission to access this component if in the backend
         if ($this->app->isClient('administrator') && !$this->app->getIdentity()->authorise('core.manage', $parts[0])) {

administrator/components/com_privacy/src/Model/ConsentsModel.php

@@ -105,6 +105,13 @@ class ConsentsModel extends ListModel
                 ->bind(':state', $state, ParameterType::INTEGER);
         }
 
+        $subject = $this->getState('filter.subject');
+
+        if (!empty($subject)) {
+            $query->where($db->quoteName('a.subject') . ' = :subject')
+                ->bind(':subject', $subject, ParameterType::STRING);
+        }
+
         // Handle the list ordering.
         $ordering  = $this->getState('list.ordering');
         $direction = $this->getState('list.direction');

libraries/src/Installer/Adapter/FileAdapter.php

@@ -48,6 +48,22 @@ class FileAdapter extends InstallerAdapter
      */
     protected $supportsDiscoverInstall = false;
 
+    /**
+     * List of processed folders
+     *
+     * @var    array
+     * @since  3.4
+     */
+    protected $folderList;
+
+    /**
+     * List of processed files
+     *
+     * @var    array
+     * @since  3.4
+     */
+    protected $fileList;
+
     /**
      * Method to copy the extension's base files from the `<files>` tag(s) and the manifest file
      *

plugins/extension/finder/src/Extension/Finder.php

@@ -137,6 +137,7 @@ final class Finder extends CMSPlugin
         );
 
         $words = array_filter(array_map('trim', $words));
+        $words = array_unique($words);
         $db    = $this->getDatabase();
         $query = $db->getQuery(true);