Merge branch 'bug-1391'

This commit is contained in:
Benny Baumann 2015-07-31 08:40:33 +02:00
commit fc7a085b29

View file

@ -115,6 +115,19 @@ class Default_Model_User {
if ($row['total'] === null) $row['total'] = 0;
$this->points = $row['total'];
if($this->points < 100) return;
$this->points = 100;
$query = "SELECT COUNT(`points`) AS `total` FROM `notary` " .
"WHERE `from` = :user AND `method` == 'Face to Face Meeting' AND `from` != `to`";
$query_params['user'] = $this->id;
$row = $this->db->query($query, $query_params)->fetch();
if ($row['total'] === null) $row['total'] = 0;
$this->points += ($row['total'] > 25) ? 50 : $row['total'];
}
/**