Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Reverting update, wrong branch duh

  • Loading branch information...
commit a4f13ab000c34a8ad2c7ec1e327315a2ad60f5fb 1 parent 4d64d0d
@svizion svizion authored
Showing with 0 additions and 43 deletions.
  1. +0 −43 bonfire/application/core_modules/users/models/user_model.php
View
43 bonfire/application/core_modules/users/models/user_model.php
@@ -435,49 +435,6 @@ public function get_login_attempts($limit=15)
}
//--------------------------------------------------------------------
-
- //--------------------------------------------------------------------
-
- /*
- Method: find_user_and_meta ( $user_id=null)
-
- Locates a single user and joins there meta information based on a the user id match.
-
- Parameters:
- $user_id - Integer of User ID to fetch
-
- Returns:
- An object with the user's info and meta information, or false on failure.
- */
- public function find_user_and_meta ( $user_id=null)
- {
- if (!is_numeric($user_id))
- {
- $this->error = 'Invalid User ID';
- }
-
- $result = $this->find( $user_id );
-
- $this->db->where('user_id', $user_id);
- $query = $this->db->get('user_meta');
-
- if ($query->num_rows())
- {
- $rows = $query->result();
-
- foreach ($rows as $row)
- {
- $key = $row->meta_key;
- $result->$key = $row->meta_value;
- }
- }
-
- $query->free_result();
- return $result;
-
- }
-
- //--------------------------------------------------------------------
}
Please sign in to comment.
Something went wrong with that request. Please try again.