Merge pull request #163 from paulcanning/2.5-stable

Fix for count_unread_pms

Author: REJack

application/libraries/Aauth.php

@@ -2054,6 +2054,8 @@ public function count_unread_pms($receiver_id=FALSE){
 
 		$query = $this->aauth_db->where('receiver_id', $receiver_id);
 		$query = $this->aauth_db->where('date_read', NULL);
+		$query = $this->aauth_db->where('pm_deleted_sender', NULL);
+		$query = $this->aauth_db->where('pm_deleted_receiver', NULL);
 		$query = $this->aauth_db->get( $this->config_vars['pms'] );
 
 		return $query->num_rows();