From 4f95507485132217c405cb876a5ae438fa5b5ce2 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 25 Oct 2010 10:52:27 -0700
Subject: [PATCH] If exportMetaData is set to false, do not print out the
 column lables OR values.  Fixes bug #11925.

---
 docs/changelog/7.x.x.txt           |  1 +
 lib/WebGUI/Asset/Wobject/Thingy.pm | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5524fea77..3a23b57af 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
  - fixed #11921: DataForm emails contain 1 table per field
  - fixed #11922: Help tempalte is squatting on a good URL
  - fixed #11923: Collaboration System Mail Cron Errors
+ - fixed #11925: Some problems in Thingy export (metaData values in CSV export)
 
 7.10.3
  - fixed #11903: Unnecessary debug in Thingy
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 5e6c8ab50..98496fdd9 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -2718,12 +2718,12 @@ sub www_export {
             my $value = $self->getFieldValue($data->{"field_".$fieldId},$field->{properties},"%y-%m-%d","%y-%m-%d %j:%n:%s");
             push(@fieldValues, $value);
         }
-        foreach my $metaDataField (@metaDataFields){
-            push(@fieldValues,$data->{$metaDataField});
+        if ($thingProperties->{exportMetaData}) {
+            foreach my $metaDataField (@metaDataFields){
+                push(@fieldValues,$data->{$metaDataField});
+            }
         }
-        $out .= "\n".WebGUI::Text::joinCSV(
-        @fieldValues
-        );
+        $out .= "\n".WebGUI::Text::joinCSV( @fieldValues );
     }
     
     $fileName = "export_".$thingProperties->{label}.".csv";