Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (9) and others # Via franck (3) and Etienne Roudeix (1) * 'master' of https://github.com/thelia/thelia: Added get/setLangId() method in session Refactored VariableXxxxx.php as ConfigXxxx.php Added name duplication check when creating a variable Completed the backoffice variable management update propel version and dependencies add some phpdoc Fixed getUrl() Typo :( Intriducec BaseI18nLoop, started variable config management Fixed URL::absoluteUrl() Fixed customer front controller, events, addec admion config. rewriting specific rewrittend url retrievement product page url global substitution sid : rewriting rewriting tables start rewriting Conflicts: core/lib/Thelia/Config/Resources/routing/admin.xml core/lib/Thelia/Core/Event/TheliaEvents.php
This commit is contained in:
@@ -1096,9 +1096,9 @@
|
||||
<table name="rewriting_url" namespace="Thelia\Model">
|
||||
<column autoIncrement="true" name="id" primaryKey="true" required="true" type="INTEGER" />
|
||||
<column name="url" required="true" size="255" type="VARCHAR" />
|
||||
<column name="view" size="255" type="VARCHAR" />
|
||||
<column name="view" required="true" size="255" type="VARCHAR" />
|
||||
<column name="view_id" size="255" type="VARCHAR" />
|
||||
<column name="view_locale" size="255" type="VARCHAR" />
|
||||
<column name="view_locale" required="true" size="255" type="VARCHAR" />
|
||||
<column name="redirected" type="INTEGER" />
|
||||
<foreign-key foreignTable="rewriting_url" name="fk_rewriting_url_redirected" onDelete="RESTRICT" onUpdate="RESTRICT">
|
||||
<reference foreign="id" local="redirected" />
|
||||
|
||||
Reference in New Issue
Block a user