Merge to master

janzarsky · Apr 21, 2014 · 993ad57 · 993ad57
1 parent 63fd1fb
commit 993ad57
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/application/models/viewer_model.php b/application/models/viewer_model.php
@@ -71,6 +71,7 @@ public function get_player_achievements($id = FALSE)
 			->from('players_achievements')
 			->join('achievements', 'players_achievements.achievement_id = achievements.id')
 			->where('player_id', $id)
+			->where('achievements.enabled', '1')
 			->order_by('achievement_id', 'asc')
 			->get()->result_array();
 	}