TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into admin

Browse Source 
Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php
This commit is contained in:
franck
2013-07-06 10:34:09 +02:00
parent 6e5b259d44 a2012259bf
commit 162084140e
609 changed files with 116620 additions and 187340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/lib/Thelia/Config/DefinePropel.php
View File

@@ -41,20 +41,10 @@ class DefinePropel {
{
$connection = $this->processorConfig["connection"];
return $conf = array(
"datasources" =>
array(
"thelia" =>
array(
"adapter" => $connection["driver"],
"connection" =>
array(
"dsn" => $connection["dsn"],
"user" => $connection["user"],
"password" => $connection["password"],
"classname" => $connection["classname"]
)
)
)
"dsn" => $connection["dsn"],
"user" => $connection["user"],
"password" => $connection["password"],
//"classname" => $connection["classname"]
);
}
}

4
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -24,6 +24,8 @@
<forms>
<form name="thelia.customer.creation" class="Thelia\Form\CustomerCreation"/>
<form name="thelia.customer.modification" class="Thelia\Form\CustomerModification"/>
<form name="thelia.admin_login" class="Thelia\Form\AdminLogin"/>
</forms>
@@ -107,4 +109,4 @@
<service id="kernel" synthetic="true" />
</services>
</config>
</config>