diff options
author | Benaka <diosmosis@users.noreply.github.com> | 2015-10-15 15:41:12 +0300 |
---|---|---|
committer | Benaka <diosmosis@users.noreply.github.com> | 2015-10-15 15:41:12 +0300 |
commit | 9a7c13bb1a1019c004ef70a89fe5feeeda716d58 (patch) | |
tree | 08d74f1aeb499f514fe2317ea71e93bf13bd4c67 | |
parent | fd3cfc2d559dd5ac3239e40ed81c340c4f8c2634 (diff) | |
parent | ce34bd4d98a1986db6fd1b691fabb8b21450cc87 (diff) |
Merge pull request #9006 from piwik/optimize_table_input_array
Fixes #9004, fix bug in optimize archive tables command: do not overwrite argument array w/ single value.
-rw-r--r-- | plugins/CoreAdminHome/Commands/OptimizeArchiveTables.php | 8 | ||||
-rw-r--r-- | plugins/CoreAdminHome/tests/Integration/Commands/OptimizeArchiveTablesTest.php | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/CoreAdminHome/Commands/OptimizeArchiveTables.php b/plugins/CoreAdminHome/Commands/OptimizeArchiveTables.php index 9a09dd7350..0e3887b261 100644 --- a/plugins/CoreAdminHome/Commands/OptimizeArchiveTables.php +++ b/plugins/CoreAdminHome/Commands/OptimizeArchiveTables.php @@ -66,9 +66,9 @@ class OptimizeArchiveTables extends ConsoleCommand private function getTableMonthsToOptimize(InputInterface $input) { - $dateSpecifier = $input->getArgument('dates'); - if (count($dateSpecifier) === 1) { - $dateSpecifier = reset($dateSpecifier); + $dateSpecifiers = $input->getArgument('dates'); + if (count($dateSpecifiers) === 1) { + $dateSpecifier = reset($dateSpecifiers); if ($dateSpecifier == self::ALL_TABLES_STRING) { return $this->getAllArchiveTableMonths(); @@ -90,7 +90,7 @@ class OptimizeArchiveTables extends ConsoleCommand } $tableMonths = array(); - foreach ($dateSpecifier as $date) { + foreach ($dateSpecifiers as $date) { $date = Date::factory($date); $tableMonths[] = ArchiveTableCreator::getTableMonthFromDate($date); } diff --git a/plugins/CoreAdminHome/tests/Integration/Commands/OptimizeArchiveTablesTest.php b/plugins/CoreAdminHome/tests/Integration/Commands/OptimizeArchiveTablesTest.php index 2fe67b98f2..c309650024 100644 --- a/plugins/CoreAdminHome/tests/Integration/Commands/OptimizeArchiveTablesTest.php +++ b/plugins/CoreAdminHome/tests/Integration/Commands/OptimizeArchiveTablesTest.php @@ -87,6 +87,11 @@ class OptimizeArchiveTablesTest extends ConsoleCommandTestCase Date::factory('now')->subMonth(5)->toString('Y_m'), ), ), + + array( + array('2015-01-01'), + array('2015_01'), + ), ); } }
\ No newline at end of file |