Merge branch 'next' into issue-145

This commit is contained in:
Sebastian Grewe 2013-09-19 09:25:15 +02:00
commit 5ce61d9f18

View File

@ -326,7 +326,7 @@ class Statistics {
* @param account_id integer User ID
* @return data integer Current Sharerate in shares/s
**/
public function getUserSharerate($account_id) {
public function getUserSharerate($account_id, $interval) {
$this->debug->append("STA " . __METHOD__, 4);
if ($data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data;
$stmt = $this->mysqli->prepare("