From b96ac9233d801ac42f5b425b1f101bde4e732327 Mon Sep 17 00:00:00 2001
From: Zachary Doll <Zachary.Doll@gmail.com>
Date: Wed, 13 Nov 2013 11:25:11 -0600
Subject: [PATCH] Fixed faulty logic in badges/all

---
 controllers/class.badgescontroller.php | 2 +-
 settings/class.hooks.php               | 8 +++-----
 views/badges/all.php                   | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/controllers/class.badgescontroller.php b/controllers/class.badgescontroller.php
index 8012994..3afee90 100644
--- a/controllers/class.badgescontroller.php
+++ b/controllers/class.badgescontroller.php
@@ -48,7 +48,7 @@ class BadgesController extends Gdn_Controller {
     
     // TODO: Add leaderboard module
     
-    $this->Render();
+    $this->Render('all');
   }
   
   /**
diff --git a/settings/class.hooks.php b/settings/class.hooks.php
index 4b7e583..b17efde 100755
--- a/settings/class.hooks.php
+++ b/settings/class.hooks.php
@@ -236,11 +236,9 @@ class YagaHooks implements Gdn_IPlugin {
   public function ProfileController_Render_Before($Sender) {
     $this->_AddResources($Sender);
     
-//    $UserID = $Sender->User->UserID;
-//    $Module = new BadgesModule();
-//    $Module->SetUser($UserID);
-    
-    $Sender->AddModule('BadgesModule');
+    if(C('Yaga.Badges.Enabled')) {
+      $Sender->AddModule('BadgesModule');
+    }
   }
 
   public function DiscussionController_Render_Before($Sender) {
diff --git a/views/badges/all.php b/views/badges/all.php
index 496b75c..1b78057 100644
--- a/views/badges/all.php
+++ b/views/badges/all.php
@@ -12,7 +12,7 @@ foreach($this->Data('Badges') as $Badge) {
   $AwardDescription = '';
   $ReadClass = ' Read';
   
-  if($Badge->UserID) {
+  if($Badge->UserID == Gdn::Session()->UserID) {
     $ReadClass = '';
     $AwardDescription = 'You earned this badge ' . Gdn_Format::Date($Badge->DateInserted, 'html') . ' from ' . $Badge->InsertUserName;
     if($Badge->Reason) {