From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 29 Mar 2016 00:46:46 +0000 (+1300)
Subject: Fix test error, I think this syntax is less tolerated by some php versions.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f06b923383600e167ea3ffa206523f40428072c0;p=civicrm-core.git

Fix test error, I think this syntax is less tolerated by some php versions.

The code is unrelated to the PR but the PR must have triggered tests to run on this exposing test-grumpiness
---

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 7020d53e90..408326aa03 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -432,8 +432,9 @@ class CRM_Export_BAO_Export {
           }
         }
       }
-      if (!empty(self::defaultReturnProperty($exportMode))) {
-        $returnProperties[self::defaultReturnProperty($exportMode)] = 1;
+      $defaultExportMode = self::defaultReturnProperty($exportMode);
+      if (!empty($defaultExportMode)) {
+        $returnProperties[$defaultExportMode] = 1;
       }
     }
     else {