From 5fbb923e401c4a28ee0220fc3d85f12927da973a Mon Sep 17 00:00:00 2001
From: Manuel Raynaud <raynaud.manu@gmail.com>
Date: Fri, 5 Jul 2013 09:43:49 +0200
Subject: [PATCH] end propel 2 migration

---
 .../Thelia/Core/Template/Loop/Category.php    |  1 -
 core/lib/Thelia/Model/Customer.php            |  1 +
 templates/smarty-sample/index.html            | 21 ++++++++++++++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/core/lib/Thelia/Core/Template/Loop/Category.php b/core/lib/Thelia/Core/Template/Loop/Category.php
index 9f1357444..7240b688c 100755
--- a/core/lib/Thelia/Core/Template/Loop/Category.php
+++ b/core/lib/Thelia/Core/Template/Loop/Category.php
@@ -24,7 +24,6 @@
 namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
diff --git a/core/lib/Thelia/Model/Customer.php b/core/lib/Thelia/Model/Customer.php
index e6cf6f18c..812a134ea 100644
--- a/core/lib/Thelia/Model/Customer.php
+++ b/core/lib/Thelia/Model/Customer.php
@@ -28,6 +28,7 @@ class Customer extends BaseCustomer {
      * @param int $countryId customer country id (from Country table)
      * @param string $email customer email, must be unique
      * @param string $plainPassword customer plain password, hash is made calling setPassword method. Not mandatory parameter but an exception is thrown if customer is new without password
+     * @param string $lang
      * @param int $reseller
      * @param null $sponsor
      * @param int $discount
diff --git a/templates/smarty-sample/index.html b/templates/smarty-sample/index.html
index 8ca3909fc..5a73519b0 100755
--- a/templates/smarty-sample/index.html
+++ b/templates/smarty-sample/index.html
@@ -13,9 +13,24 @@ An image from asset directory :
 	jQuery data: <span id="jquery_block"></span>
 </div>
 
-{loop type="category" name="catloop1" }
-    <li>{$__COUNT__}/{$__TOTAL__} : {$ID} {$TITLE}</li>
-{/loop}
+<div>
+    <p>Category loop example</p>
+    <ul>
+        {loop type="category" name="catloop1"}
+            <li>{$__COUNT__}/{$__TOTAL__} : {$ID} {$TITLE}, children: {$NB_CHILD}
+                {ifloop rel="inner1"}
+                    <ul>
+                        {loop type="category" name="inner1" parent="{$ID}"}
+                            <li>Sub cat {$ID} (parent is {$PARENT}): {$TITLE}</li>
+                        {/loop}
+                    </ul>
+                {/ifloop}
+            </li>
+        {/loop}
+    </ul>
+</div>
+
+
 
 
 <div>