Handle the case that JFolder::files returns 'false' (#11715)

joomla · Apr 29, 2018 · a6e20f9 · a6e20f9
1 parent 116a507
commit a6e20f9
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
@@ -1145,14 +1145,16 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid)
 
 				if ($schemapath !== '')
 				{
-					$files = str_replace('.sql', '', \JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
-					usort($files, 'version_compare');
+					$files = \JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$');
 
-					if (!count($files))
+					if (empty($files))
 					{
 						return $update_count;
 					}
 
+					$files = str_replace('.sql', '', $files);
+					usort($files, 'version_compare');
+
 					$query = $db->getQuery(true)
 						->select('version_id')
 						->from('#__schemas')