Merge pull request #2331 from tmihalik/patch-2

Update builder.c
phalcon · Apr 18, 2014 · 6f614d3 · 6f614d3
2 parents 7051615 + 056176c
commit 6f614d3
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/ext/mvc/model/query/builder.c b/ext/mvc/model/query/builder.c
@@ -1,4 +1,3 @@
-
 /*
   +------------------------------------------------------------------------+
   | Phalcon Framework                                                      |
@@ -543,7 +542,7 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, getFrom){
 }
 
 /**
- * Adds a INNER join to the query
+ * Adds a join to the query
  *
  *<code>
  *	$builder->join('Robots');
@@ -595,13 +594,11 @@ PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, join){
  *	$builder->innerJoin('Robots');
  *	$builder->innerJoin('Robots', 'r.id = RobotsParts.robots_id');
  *	$builder->innerJoin('Robots', 'r.id = RobotsParts.robots_id', 'r');
- *	$builder->innerJoin('Robots', 'r.id = RobotsParts.robots_id', 'r', 'LEFT');
  *</code>
  *
  * @param string $model
  * @param string $conditions
  * @param string $alias
- * @param string $type
  * @return Phalcon\Mvc\Model\Query\Builder
  */
 PHP_METHOD(Phalcon_Mvc_Model_Query_Builder, innerJoin){