Merge pull request #113 from Kunstmaan/hotfix/2.3.17

hotfix/2.3.17
Kunstmaan · Aug 7, 2014 · bebf0c4 · bebf0c4
2 parents 1f495bc + 964d96a
commit bebf0c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Resources/views/Default/export.csv.twig b/Resources/views/Default/export.csv.twig
@@ -14,7 +14,7 @@
 {%- set columnName = column.name -%}
 {%- set template = column.template -%}
 {% if template is not null and template != 1 and template != "" %}
-{% include template with {'row': item, 'columnName': columnName, 'object': adminlist.getValue(item, columnName)} %}
+{{- quote|raw -}}{% include template with {'row': item, 'columnName': columnName, 'object': adminlist.getValue(item, columnName)} %}{{- quote|raw -}}
 {% else %}
 {{- quote|raw -}}{{- adminlist.getStringValue(item, columnName) -}}{{- quote|raw -}}
 {% endif %}

diff --git a/Service/ExportService.php b/Service/ExportService.php
@@ -82,7 +82,7 @@ public function createExcelSheet($adminlist)
             $row = array();
             foreach ($adminlist->getExportColumns() as $column) {
                 $data = $adminlist->getStringValue($item[0], $column->getName());
-                if ($data instanceof \Doctrine\Common\Persistence\Proxy) {
+                if (is_object($data)) {
                     if (!$this->renderer->exists($column->getTemplate())) {
                         throw new \Exception('No export template defined for ' . get_class($data));
                     }
@@ -125,4 +125,4 @@ public function setRenderer($renderer)
     {
         $this->renderer = $renderer;
     }
-}
+}