Merge remote-tracking branch 'origin/MAGETWO-46697' into develop

magento · Jan 12, 2016 · 1919e7e · 1919e7e
2 parents 799d3c3 + 8af8a76
commit 1919e7e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataResetCommand.php
@@ -66,7 +66,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!empty($sampleDataPackages)) {
             foreach (array_keys($sampleDataPackages) as $name) {
                 $moduleName = $this->packageInfo->getModuleName($name);
-                $this->moduleResource->setDataVersion($moduleName, '');
+                if ($moduleName !== null) {
+                    $this->moduleResource->setDataVersion($moduleName, '');
+                }
             }
             $output->writeln('<info>' . 'Reset of sample data version completed successfully.' . '</info>');
         } else {