WIP

Merge master

core/lib/Thelia/Model/Base/RewritingUrl.php

@@ -298,7 +298,7 @@ abstract class RewritingUrl implements ActiveRecordInterface
      */
     public function hasVirtualColumn($name)
     {
-        return array_key_exists($name, $this->virtualColumns);
+        return isset($this->virtualColumns[$name]);
     }
 
     /**

install/sqldb.map

@@ -0,0 +1,2 @@
+# Sqlfile -> Database map
+thelia.sql=thelia