Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/idiorm.php
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,6 @@ protected function _add_join_source($join_operator, $table, $constraint, $table_
*/
public function raw_join($table, $constraint, $table_alias, $parameters = array())
{
$feather = \Slim\Slim::getInstance();
$table = $feather->prefix.$table;

// Add table alias if present
if (!is_null($table_alias)) {
$table_alias = $this->_quote_identifier($table_alias);
Expand Down
4 changes: 1 addition & 3 deletions model/viewtopic.php
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
->select_many($select_print_posts)
->inner_join('users', array('u.id', '=', 'p.poster_id'), 'u')
->inner_join('groups', array('g.g_id', '=', 'u.group_id'), 'g')
->left_outer_join('online', array('o.user_id', '=', 'u.id'), 'o')
->left_outer_join('online', array('o2.user_id', '!=', 1), 'o2', true)
->left_outer_join('online', array('o.idle', '=', 0), null, true)
->raw_join('LEFT OUTER JOIN '.$this->feather->prefix.'online', "o.user_id!=1 AND o.idle=0 AND o.user_id=u.id", 'o')
->where_in('p.id', $post_ids)
->order_by('p.id')
->find_array();
Expand Down