Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-12-17 05:27:44 +0300
committermattab <matthieu.aubry@gmail.com>2014-12-17 05:27:44 +0300
commitd9199fea0033e2c46f4d66504b084892e9463169 (patch)
treee64261d177a45e7ddec0cd7c10c77f38d2e7efd3 /core
parent472cf46f366be39e0c4e95504b5efe3aacaf4cac (diff)
fixes #6862 use array_values when using as a bind
+ submodules
Diffstat (limited to 'core')
-rw-r--r--core/DataAccess/ArchiveSelector.php2
-rw-r--r--core/DataAccess/Model.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index a89638f964..8011924b0c 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -171,7 +171,7 @@ class ArchiveSelector
foreach ($monthToPeriods as $table => $periods) {
$firstPeriod = reset($periods);
- $bind = $siteIds;
+ $bind = array_values($siteIds);
if ($firstPeriod instanceof Range) {
$dateCondition = "period = ? AND date1 = ? AND date2 = ?";
diff --git a/core/DataAccess/Model.php b/core/DataAccess/Model.php
index 6e072bf1bc..0e4b2845a7 100644
--- a/core/DataAccess/Model.php
+++ b/core/DataAccess/Model.php
@@ -37,6 +37,7 @@ class Model
// prevent error 'The SELECT would examine more than MAX_JOIN_SIZE rows'
Db::get()->query('SET SQL_BIG_SELECTS=1');
+ $idSites = array_values($idSites);
$idSitesString = Common::getSqlStringFieldsArray($idSites);
$query = 'SELECT t1.idarchive FROM `' . $archiveTable . '` t1
@@ -82,7 +83,7 @@ class Model
}
$sql = implode(" OR ", $sql);
-
+ $idSites = array_values($idSites);
$sqlSites = " AND idsite IN (" . Common::getSqlStringFieldsArray($idSites) . ")";
$bind = array_merge($bind, $idSites);
@@ -128,6 +129,7 @@ class Model
public function deleteArchiveIds($numericTable, $blobTable, $idsToDelete)
{
+ $idsToDelete = array_values($idsToDelete);
$query = "DELETE FROM %s WHERE idarchive IN (" . Common::getSqlStringFieldsArray($idsToDelete) . ")";
Db::query(sprintf($query, $numericTable), $idsToDelete);