Merge pull request civicrm#291 from eileenmcnaughton/7.x-4.6

eileenmcnaughton · eileenmcnaughton · commit 0c0f26e9d6e2 · 2015-06-23T09:25:35.000+12:00
enotice fix
diff --git a/modules/civicrm_engage/Engage/Report/Form/WalkList.php b/modules/civicrm_engage/Engage/Report/Form/WalkList.php
@@ -461,7 +461,7 @@ function executePrintmode($rows) {
       if (!empty($value['civicrm_contact_gender_id'])){
         $sex  = $gender[CRM_Utils_Array::value('civicrm_contact_gender_id', $value)];
       }
-      $sex  = is_null($sex) ? '' : $sex;
+      $sex  = empty($sex) ? '' : $sex;
       $lang = strtoupper(substr($value[$this->_demoTable . '_' . $this->_demoLangCol], 0, 2
         ));
       $party       = substr($value["{$this->_voterInfoTable}_{$this->_partyCol}"], 0, 1);

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ function executePrintmode($rows) {`
`461`	`461`	`if (!empty($value['civicrm_contact_gender_id'])){`
`462`	`462`	`$sex = $gender[CRM_Utils_Array::value('civicrm_contact_gender_id', $value)];`
`463`	`463`	`}`
`464`		`- $sex = is_null($sex) ? '' : $sex;`
	`464`	`+ $sex = empty($sex) ? '' : $sex;`
`465`	`465`	`$lang = strtoupper(substr($value[$this->_demoTable . '_' . $this->_demoLangCol], 0, 2`
`466`	`466`	`));`
`467`	`467`	`$party = substr($value["{$this->_voterInfoTable}_{$this->_partyCol}"], 0, 1);`