isEth bug fixed

ArtemKo7v · ArtemKo7v · commit 0121c41e2569 · 2018-03-05T14:58:35.000+07:00
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -1146,14 +1146,15 @@ public function getLastTransfers(array $options = array(), $showEth = FALSE){
 
         if(isset($options['token']) && isset($options['history'])){
             $search['contract'] = $options['token'];
+        }elseif(!$showEth){
+            $search['contract'] = array('$ne' => 'ETH');   
         }
 
         $sort = array("timestamp" => -1);
 
         if(isset($options['timestamp']) && ($options['timestamp'] > 0)){
             $search['timestamp'] = array('$gt' => $options['timestamp']);
         }
-        if(!$showEth) $search['contract'] = array('$ne' => 'ETH');
         $limit = isset($options['limit']) ? (int)$options['limit'] : false;
         $cursor = $this->oMongo->find('operations', $search, $sort, $limit);
 

Original file line number	Diff line number	Diff line change
`@@ -1146,14 +1146,15 @@ public function getLastTransfers(array $options = array(), $showEth = FALSE){`
`1146`	`1146`
`1147`	`1147`	`if(isset($options['token']) && isset($options['history'])){`
`1148`	`1148`	`$search['contract'] = $options['token'];`
	`1149`	`+ }elseif(!$showEth){`
	`1150`	`+ $search['contract'] = array('$ne' => 'ETH');`
`1149`	`1151`	`}`
`1150`	`1152`
`1151`	`1153`	`$sort = array("timestamp" => -1);`
`1152`	`1154`
`1153`	`1155`	`if(isset($options['timestamp']) && ($options['timestamp'] > 0)){`
`1154`	`1156`	`$search['timestamp'] = array('$gt' => $options['timestamp']);`
`1155`	`1157`	`}`
`1156`		`- if(!$showEth) $search['contract'] = array('$ne' => 'ETH');`
`1157`	`1158`	`$limit = isset($options['limit']) ? (int)$options['limit'] : false;`
`1158`	`1159`	`$cursor = $this->oMongo->find('operations', $search, $sort, $limit);`
`1159`	`1160`