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

Merge pull request #381 from TheSerapher/issue-378

Browse Source 
Use poolhash rate if nethash is smaller
This commit is contained in:
Sebastian Grewe 2013-07-05 13:04:11 -07:00
commit 346d9656d8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/include/smarty_globals.inc.php
View File

@ -28,6 +28,9 @@ $iCurrentActiveWorkers = $worker->getCountAllActiveWorkers();
$iCurrentPoolHashrate = $statistics->getCurrentHashrate(); $iCurrentPoolHashrate = $statistics->getCurrentHashrate();
$iCurrentPoolShareRate = $statistics->getCurrentShareRate(); $iCurrentPoolShareRate = $statistics->getCurrentShareRate();
// Avoid confusion, ensure our nethash isn't higher than poolhash
if ($iCurrentPoolHashrate > $dNetworkHashrate) $dNetworkHashrate = $iCurrentPoolHashrate;
// Global data for Smarty // Global data for Smarty
$aGlobal = array( $aGlobal = array(
'slogan' => $config['website']['slogan'], 'slogan' => $config['website']['slogan'],