merge w mona

shs12010 · Dec 5, 2017 · 2369e62 · 2369e62
2 parents 9a5406a + a0ba5f6
commit 2369e62
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/www/application/models/User_Tweets_Model.php b/www/application/models/User_Tweets_Model.php
@@ -1,10 +1,11 @@
 <?php
 class User_Tweets_Model extends CI_Model {
    function getPosts(){
-      //$_SESSION['user_id'] = $id;
+
+
       $this->db->select("first_name, last_name, username, tweet, date_time");
       $this->db->from('Users, Tweets');
-      $this->db->where('Users.id = Tweets.user_id');
+      $this->db->where("Users.id = Tweets.user_id and Users.id = $user_id");
       $this->db->order_by('date_time', 'DESC');
       $query = $this->db->get();
       return $query->result_array();