230c230
<         return $this->_join(null, $name, null, $cols, $schema);
---
>         return $this->joinInner($name, null, $cols, $schema);
744c744
<         if (!is_null($type) && !in_array($type, self::$_joinTypes)) {
---
>         if (!in_array($type, self::$_joinTypes)) {
1043d1042
<         $fromAdded = false;
1048a1048,1052
>             // Add join clause (if applicable)
>             if (! empty($from)) {
>                 $tmp .= ' ' . strtoupper($table['joinType']) . ' ';
>             }
> 
1053c1057
<             if (!empty($table['joinCondition'])) {
---
>             if (!empty($from) && ! empty($table['joinCondition'])) {
1057,1065c1061,1062
<             // Add join clause (if applicable)
<             if (!is_null($table['joinType'])) {
<                 array_push($from, ' ' . strtoupper($table['joinType']) . ' ' . $tmp);
<             } elseif ($fromAdded) {
<                 array_unshift($from, ' ' . strtoupper(self::INNER_JOIN) . ' ' . $tmp);
<             } else {
<                 $fromAdded = true;
<                 array_unshift($from, $tmp);
<             }
---
>             // Add the table name and condition add to the list
>             $from[] = $tmp;