From 6a7d5ec98e929e8ad7e175c05d72284a3d5770c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20ESPECHE?= <michael-espeche@Micks-iMac.local>
Date: Thu, 29 Aug 2013 16:17:49 +0200
Subject: [PATCH] WIP

Merge master
---
 core/lib/Thelia/Model/Base/RewritingUrl.php | 2 +-
 install/sqldb.map                           | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 install/sqldb.map

diff --git a/core/lib/Thelia/Model/Base/RewritingUrl.php b/core/lib/Thelia/Model/Base/RewritingUrl.php
index 75ee97e79..a6bcd3a26 100644
--- a/core/lib/Thelia/Model/Base/RewritingUrl.php
+++ b/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]);
     }
 
     /**
diff --git a/install/sqldb.map b/install/sqldb.map
new file mode 100644
index 000000000..63a93baa8
--- /dev/null
+++ b/install/sqldb.map
@@ -0,0 +1,2 @@
+# Sqlfile -> Database map
+thelia.sql=thelia