From 0dd1dc20c8ccf8eee6cee3b3cf8d4d9bdc5a6401 Mon Sep 17 00:00:00 2001
From: Benjamin Eberlei <kontakt@beberlei.de>
Date: Sat, 25 Jun 2011 10:25:22 +0200
Subject: [PATCH] DDC-1227 - Fix regression in QueryBuilder::add() due to
 Expr\From refactoring.

---
 lib/Doctrine/ORM/QueryBuilder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php
index b67a550d8..4facce77f 100644
--- a/lib/Doctrine/ORM/QueryBuilder.php
+++ b/lib/Doctrine/ORM/QueryBuilder.php
@@ -986,7 +986,7 @@ class QueryBuilder
             foreach ($fromParts as $from) {
                 $fromClause = (string) $from;
 
-                if (isset($joinParts[$from->getAlias()])) {
+                if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) {
                     foreach ($joinParts[$from->getAlias()] as $join) {
                         $fromClause .= ' ' . ((string) $join);
                     }