refs #4123 Removing some warnings

1 files changed, 13 insertions, 12 deletions

diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 849b910e21..3fabe7cf55 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -173,22 +173,23 @@ class PluginInstaller
      */
     private function getNameOfFirstSubfolder($pluginDir)
     {
-        if ($dir = opendir($pluginDir)) {
-            $firstSubFolder = '';
-
-            while ($file = readdir($dir)) {
-                if ($file[0] != '.' && is_dir($pluginDir . DIRECTORY_SEPARATOR . $file)) {
-                    $firstSubFolder = $file;
-                    break;
-                }
-            }
+        if (!($dir = opendir($pluginDir))) {
+            return false;
+        }
+        $firstSubFolder = '';
 
-            if (empty($firstSubFolder)) {
-                throw new PluginInstallerException('The plugin ZIP file does not contain a subfolder, but Piwik expects plugin files to be within a subfolder in the Zip archive.');
+        while ($file = readdir($dir)) {
+            if ($file[0] != '.' && is_dir($pluginDir . DIRECTORY_SEPARATOR . $file)) {
+                $firstSubFolder = $file;
+                break;
             }
+        }
 
-            return $firstSubFolder;
+        if (empty($firstSubFolder)) {
+            throw new PluginInstallerException('The plugin ZIP file does not contain a subfolder, but Piwik expects plugin files to be within a subfolder in the Zip archive.');
         }
+
+        return $firstSubFolder;
     }
 
     private function fixPluginFolderIfNeeded($tmpPluginFolder)