Index: views_query.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views_query.inc,v
retrieving revision 1.51.2.11
diff -u -r1.51.2.11 views_query.inc
--- views_query.inc	12 Apr 2007 15:18:59 -0000	1.51.2.11
+++ views_query.inc	14 May 2007 12:33:39 -0000
@@ -554,10 +554,13 @@
    * @param $alias_prefix
    *   An optional prefix for the table alias.
    */
-  function get_table_name($table, $table_num, $alias_prefix = null) {
+  function get_table_name($table, $table_num, $joininfo, $alias_prefix = null) {
     if (is_null($alias_prefix)) {
       $alias_prefix = $this->use_alias_prefix;
     }
+    if (isset($joininfo['right']['alias'])) {
+      $table = $joininfo['right']['alias'];
+    }
     return ($table_num < 2 ? $alias_prefix . $table : $alias_prefix . $table . $table_num);
   }
 
@@ -588,10 +591,9 @@
       $table_real = (isset($table_data[$table]['name']) ? $table_data[$table]['name'] : $table);
 
       $table_num = $tinfo['num'];
-      $table_alias = $this->get_table_name($table, $table_num, $tinfo['alias_prefix']);
-
       $joininfo = (!$this->joins[$table][$table_num] ?
         $table_data[$table]['join'] : $this->joins[$table][$table_num]);
+      $table_alias = $this->get_table_name($table, $table_num, $joininfo, $tinfo['alias_prefix']);
 
       $left_table_alias = isset($joininfo['left']['alias']) ? $joininfo['left']['alias'] : $tinfo['alias_prefix'];
       $left_table_alias .= $joininfo['left']['table'];