Merge master
This commit is contained in:
Michaël ESPECHE
2013-08-29 16:17:49 +02:00
parent 2396b78ce9
commit 6a7d5ec98e
2 changed files with 3 additions and 1 deletions

View File

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

2
install/sqldb.map Normal file
View File

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