RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1534 from freynder/next

Browse Source 
Bugfix: shares and shares_archive values should be added up.
This commit is contained in:
Sebastian Grewe 2014-01-22 05:38:06 -08:00
commit be19318e26
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/include/classes/statistics.class.php
View File

@ -753,7 +753,7 @@ class Statistics extends Base {
// Initilize array // Initilize array
for ($i = 0; $i < 24; $i++) $aData[($iStartHour + $i) % 24] = 0; for ($i = 0; $i < 24; $i++) $aData[($iStartHour + $i) % 24] = 0;
// Fill data // Fill data
while ($row = $result->fetch_assoc()) $aData[$row['hour']] = $row['hashrate']; while ($row = $result->fetch_assoc()) $aData[$row['hour']] += $row['hashrate'];
return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData); return $this->memcache->setCache(__FUNCTION__ . $account_id, $aData);
} }
return $this->sqlError(); return $this->sqlError();
@ -792,7 +792,7 @@ class Statistics extends Base {
// Initilize array // Initilize array
for ($i = 0; $i < 24; $i++) $aData[($iStartHour + $i) % 24] = 0; for ($i = 0; $i < 24; $i++) $aData[($iStartHour + $i) % 24] = 0;
// Fill data // Fill data
while ($row = $result->fetch_assoc()) $aData[$row['hour']] = (int) $row['hashrate']; while ($row = $result->fetch_assoc()) $aData[$row['hour']] += (int) $row['hashrate'];
return $this->memcache->setCache(__FUNCTION__, $aData); return $this->memcache->setCache(__FUNCTION__, $aData);
} }
return $this->sqlError(); return $this->sqlError();