[1.6] Fixed i18n behavior with namespaces (closes #1359)

propelorm · Apr 29, 2011 · 813e729 · 813e729
1 parent 327caba
commit 813e729
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/generator/lib/behavior/i18n/I18nBehaviorQueryBuilderModifier.php b/generator/lib/behavior/i18n/I18nBehaviorQueryBuilderModifier.php
@@ -63,10 +63,11 @@ protected function addUseI18nQuery()
 		$i18nTable = $this->behavior->getI18nTable();
 		$fk = $this->behavior->getI18nForeignKey();
 		return $this->behavior->renderTemplate('queryUseI18nQuery', array(
-			'queryClass'       => $this->builder->getNewStubQueryBuilder($i18nTable)->getClassname(),
-			'defaultLocale'    => $this->behavior->getDefaultLocale(),
-			'i18nRelationName' => $this->builder->getRefFKPhpNameAffix($fk),
-			'localeColumn'     => $this->behavior->getLocaleColumn()->getPhpName(),
+			'queryClass'           => $this->builder->getNewStubQueryBuilder($i18nTable)->getClassname(),
+			'namespacedQueryClass' => $this->builder->getNewStubQueryBuilder($i18nTable)->getFullyQualifiedClassname(),
+			'defaultLocale'        => $this->behavior->getDefaultLocale(),
+			'i18nRelationName'     => $this->builder->getRefFKPhpNameAffix($fk),
+			'localeColumn'         => $this->behavior->getLocaleColumn()->getPhpName(),
 		));
 	}
 

diff --git a/generator/lib/behavior/i18n/templates/queryUseI18nQuery.php b/generator/lib/behavior/i18n/templates/queryUseI18nQuery.php
@@ -14,5 +14,5 @@ public function useI18nQuery($locale = '<?php echo $defaultLocale ?>', $relation
 {
 	return $this
 		->joinI18n($locale, $relationAlias, $joinType)
-		->useQuery($relationAlias ? $relationAlias : '<?php echo $i18nRelationName ?>', '<?php echo $queryClass ?>');
+		->useQuery($relationAlias ? $relationAlias : '<?php echo $i18nRelationName ?>', '<?php echo $namespacedQueryClass ?>');
 }