Merge branch 'bug-1391'

manager/application/models/User.php

@@ -108,8 +108,8 @@ class Default_Model_User {
      * user's points
      */
     public function refreshPoints() {
-        $query = "select sum(`points`) as `total` from `notary` " .
-        	"where `to` = :user and method != 'Administrative Increase' and from != to";
+        $query = "SELECT SUM(`points`) AS `total` FROM `notary` " .
+            "WHERE `to` = :user AND `method` != 'Administrative Increase' AND `from` != `to`";
         $query_params['user'] = $this->id;
         $row = $this->db->query($query, $query_params)->fetch();
         if ($row['total'] === null) $row['total'] = 0;
@@ -225,8 +225,7 @@ class Default_Model_User {
      * 		The amount of points that have been issued (might be less than
      * 		$points)
      */
-    public function assure(Default_Model_User $assuree, $points, $location,
-            $date) {
+    public function assure(Default_Model_User $assuree, $points, $location, $date) {
         // Sanitize inputs
         $points = intval($points);
         $location = stripslashes($location);