civicrm-core.git
8 years agoCRM-17626 Move BULK_MAIL_INSERT_COUNT
JKingsnorth [Thu, 26 Nov 2015 15:45:43 +0000 (15:45 +0000)]
CRM-17626 Move BULK_MAIL_INSERT_COUNT

8 years agoCRM-17625 Dispell the evil eye
JKingsnorth [Thu, 26 Nov 2015 09:17:45 +0000 (09:17 +0000)]
CRM-17625 Dispell the evil eye

8 years agoCRM17622 Remove unused icons
JKingsnorth [Wed, 25 Nov 2015 14:35:17 +0000 (14:35 +0000)]
CRM17622 Remove unused icons

9 years agoMerge pull request #7131 from davecivicrm/CRM-17505
Dave Greenberg [Wed, 4 Nov 2015 22:22:34 +0000 (14:22 -0800)]
Merge pull request #7131 from davecivicrm/CRM-17505

CRM-17505 - Choose date range layout fix.

9 years agoCRM-17505 - Choose date range layout fix.
Dave Greenberg [Wed, 4 Nov 2015 22:20:15 +0000 (14:20 -0800)]
CRM-17505 - Choose date range layout fix.

----------------------------------------
* CRM-17505: Fix search form layout for date range fields
  https://issues.civicrm.org/jira/browse/CRM-17505

9 years agoMinor cleanup
Coleman Watts [Wed, 4 Nov 2015 21:45:43 +0000 (16:45 -0500)]
Minor cleanup

9 years agoMerge pull request #7092 from totten/master-exturl-default
Tim Otten [Wed, 4 Nov 2015 21:20:10 +0000 (13:20 -0800)]
Merge pull request #7092 from totten/master-exturl-default

CRM-16373 - Settings - Fix default for ext_repo_url

9 years agoMerge pull request #7127 from rohankatkar/Master_4.7
Kurund Jalmi [Wed, 4 Nov 2015 15:17:49 +0000 (20:47 +0530)]
Merge pull request #7127 from rohankatkar/Master_4.7

Webtests Fixes - Master

9 years agoWebtests Fixes - Master
Web Access [Wed, 4 Nov 2015 13:21:09 +0000 (18:51 +0530)]
Webtests Fixes - Master

9 years agoMerge pull request #7122 from rohankatkar/Master_Webtest
Monish Deb [Wed, 4 Nov 2015 06:01:39 +0000 (11:31 +0530)]
Merge pull request #7122 from rohankatkar/Master_Webtest

Webtest fixes- Master

9 years agoMerge pull request #7074 from jitendrapurohit/CRM-17433
Dave Greenberg [Wed, 4 Nov 2015 02:08:32 +0000 (18:08 -0800)]
Merge pull request #7074 from jitendrapurohit/CRM-17433

CRM-17433 - Invalid error message on deleting Participant record if N…

9 years agoMerge pull request #7120 from monishdeb/testFailures
Dave Greenberg [Wed, 4 Nov 2015 02:01:33 +0000 (18:01 -0800)]
Merge pull request #7120 from monishdeb/testFailures

CRM-17481 fix - Simply saving Individual Edit Form, create new inheri…

9 years agoMerge pull request #7117 from eileenmcnaughton/CRM-17490
Eileen McNaughton [Tue, 3 Nov 2015 22:56:19 +0000 (14:56 -0800)]
Merge pull request #7117 from eileenmcnaughton/CRM-17490

CRM-17490 fix interface error on activity import

9 years agoMerge pull request #7115 from mollux/CRM-17486
Eileen McNaughton [Tue, 3 Nov 2015 22:49:24 +0000 (14:49 -0800)]
Merge pull request #7115 from mollux/CRM-17486

CRM-17486  - Added skipRecentView support when creating a relationship.

9 years agoWebtest fixes- Master
Web Access [Tue, 3 Nov 2015 13:18:10 +0000 (18:48 +0530)]
Webtest fixes- Master

9 years agoMerge pull request #7112 from rohankatkar/4.7-WebtestMaster
Monish Deb [Tue, 3 Nov 2015 12:49:55 +0000 (18:19 +0530)]
Merge pull request #7112 from rohankatkar/4.7-WebtestMaster

Webtest Fix-Master

9 years agoCRM-17481 fix - Simply saving Individual Edit Form, create new inherited membership...
monishdeb [Tue, 3 Nov 2015 11:16:16 +0000 (16:46 +0530)]
CRM-17481 fix - Simply saving Individual Edit Form, create new inherited membership everytime

https://issues.civicrm.org/jira/browse/CRM-17481

9 years agoWarning fix
Web Access [Tue, 3 Nov 2015 04:50:30 +0000 (10:20 +0530)]
Warning fix

9 years agoMerge branch '4.6' into master
Coleman Watts [Mon, 2 Nov 2015 21:58:29 +0000 (16:58 -0500)]
Merge branch '4.6' into master

Conflicts:
templates/CRM/common/footer.tpl

9 years agoMerge pull request #7105 from eileenmcnaughton/master
Monish Deb [Mon, 2 Nov 2015 19:15:26 +0000 (00:45 +0530)]
Merge pull request #7105 from eileenmcnaughton/master

enotice fix

9 years agoMerge pull request #7113 from sudhabisht/TestFix
Monish Deb [Mon, 2 Nov 2015 19:14:16 +0000 (00:44 +0530)]
Merge pull request #7113 from sudhabisht/TestFix

Fix for webtest failure

9 years agoCRM-17490 fix interface error on activity import
eileenmcnaugton [Mon, 2 Nov 2015 18:25:33 +0000 (07:25 +1300)]
CRM-17490 fix interface error on activity import

9 years agoMerge pull request #7111 from kurund/CRM-17393
Dave Greenberg [Mon, 2 Nov 2015 18:19:15 +0000 (10:19 -0800)]
Merge pull request #7111 from kurund/CRM-17393

CRM-17393, changed the incorrect logic

9 years agoMerge pull request #7101 from colemanw/footer
Dave Greenberg [Mon, 2 Nov 2015 18:17:04 +0000 (10:17 -0800)]
Merge pull request #7101 from colemanw/footer

Footer tpl cleanup

9 years agoAdded possibility to skip the recent view list when creating a relationship.
Mattias Michaux [Mon, 2 Nov 2015 14:59:20 +0000 (15:59 +0100)]
Added possibility to skip the recent view list when creating a relationship.

9 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-02-19-51-55
Kurund Jalmi [Mon, 2 Nov 2015 14:22:06 +0000 (19:52 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-02-19-51-55

9 years agoWebtestFix
Sudha Bisht [Mon, 2 Nov 2015 13:53:29 +0000 (19:23 +0530)]
WebtestFix

9 years agoWebtest Fix-Master
Web Access [Mon, 2 Nov 2015 12:31:47 +0000 (18:01 +0530)]
Webtest Fix-Master

9 years agoCRM-17393, changed the incorrect logic
Kurund Jalmi [Mon, 2 Nov 2015 12:01:49 +0000 (17:31 +0530)]
CRM-17393, changed the incorrect logic

9 years agoMerge pull request #7108 from yashodha/CRM-17478
Yashodha Chaku [Mon, 2 Nov 2015 08:03:19 +0000 (13:33 +0530)]
Merge pull request #7108 from yashodha/CRM-17478

CRM-17478: Accounting Batch Listings : FATAL error

9 years agoCRM-17478: Accounting Batch Listings : FATAL error
yashodha [Mon, 2 Nov 2015 05:59:58 +0000 (11:29 +0530)]
CRM-17478: Accounting Batch Listings : FATAL error

----------------------------------------
* CRM-17478: Accounting Batch Listings : FATAL error
  https://issues.civicrm.org/jira/browse/CRM-17478

9 years agoenotice fix
eileenmcnaugton [Mon, 2 Nov 2015 03:29:08 +0000 (16:29 +1300)]
enotice fix

9 years agoFix setting undefined view value
Coleman Watts [Sun, 1 Nov 2015 19:52:19 +0000 (14:52 -0500)]
Fix setting undefined view value

9 years agoFooter tpl cleanup
Coleman Watts [Sun, 1 Nov 2015 13:38:18 +0000 (08:38 -0500)]
Footer tpl cleanup

9 years agoMerge pull request #7049 from colemanw/angularTitle
colemanw [Sun, 1 Nov 2015 12:27:48 +0000 (07:27 -0500)]
Merge pull request #7049 from colemanw/angularTitle

Set CMS page title from Angular

9 years agoMerge pull request #7076 from totten/4.6-weight-sgn
Kurund Jalmi [Sun, 1 Nov 2015 11:20:59 +0000 (16:50 +0530)]
Merge pull request #7076 from totten/4.6-weight-sgn

CRM-17466 - Refine error message

9 years agoMerge pull request #7093 from totten/master-iats
Kurund Jalmi [Sun, 1 Nov 2015 10:52:54 +0000 (16:22 +0530)]
Merge pull request #7093 from totten/master-iats

composer.json - Add iATS extension

9 years agoMerge pull request #7096 from deepak-srivastava/CRM-16865-mass-dedupe-test-cases
Kurund Jalmi [Sun, 1 Nov 2015 10:50:06 +0000 (16:20 +0530)]
Merge pull request #7096 from deepak-srivastava/CRM-16865-mass-dedupe-test-cases

CRM-16865 - dedupe batch merge test cases

9 years agoMerge pull request #7085 from rohankatkar/webtests-4.7-alpha
Kurund Jalmi [Sun, 1 Nov 2015 10:49:40 +0000 (16:19 +0530)]
Merge pull request #7085 from rohankatkar/webtests-4.7-alpha

Webtest fix

9 years agoMerge pull request #7097 from seamuslee001/CRM-17303-test2
colemanw [Sun, 1 Nov 2015 01:20:53 +0000 (21:20 -0400)]
Merge pull request #7097 from seamuslee001/CRM-17303-test2

CRM-17303 fix radiodate test

9 years agoRemove month extension in test as no longer needed as we are extending the year
Seamus Lee [Sat, 31 Oct 2015 22:10:47 +0000 (22:10 +0000)]
Remove month extension in test as no longer needed as we are extending the year

9 years agoCRM-17303 Fix Radio Date test
Seamus Lee [Sat, 31 Oct 2015 21:34:16 +0000 (21:34 +0000)]
CRM-17303 Fix Radio Date test

Further test fix

Further test fix

Further test fix

Further test fix

9 years agoAdd title to caseType screens
Coleman Watts [Sat, 31 Oct 2015 21:42:00 +0000 (17:42 -0400)]
Add title to caseType screens

9 years agoStatusPage tpl cleanup
Coleman Watts [Sat, 31 Oct 2015 21:40:00 +0000 (17:40 -0400)]
StatusPage tpl cleanup

9 years agoMerge pull request #7094 from lcdservices/CRM-17467
Dave Greenberg [Fri, 30 Oct 2015 22:45:01 +0000 (15:45 -0700)]
Merge pull request #7094 from lcdservices/CRM-17467

CRM-17467 contrib detail report - batch records

9 years agobatch merge test cases
deepak-srivastava [Fri, 30 Oct 2015 21:17:52 +0000 (21:17 +0000)]
batch merge test cases

9 years agoCRM-13823 - Only count status messages with priority >= 3
Coleman Watts [Fri, 30 Oct 2015 20:09:28 +0000 (16:09 -0400)]
CRM-13823 - Only count status messages with priority >= 3

9 years agoSupport rich text titles + plain document title
Coleman Watts [Fri, 30 Oct 2015 20:04:04 +0000 (16:04 -0400)]
Support rich text titles + plain document title

9 years agoCRM-17467 contrib detail report - batch records
Brian Shaughnessy [Fri, 30 Oct 2015 19:42:08 +0000 (15:42 -0400)]
CRM-17467 contrib detail report - batch records

9 years agoForce page title to plain text
Coleman Watts [Sun, 25 Oct 2015 15:50:43 +0000 (11:50 -0400)]
Force page title to plain text

9 years agoSet CMS page title from Angular
Coleman Watts [Sun, 25 Oct 2015 15:36:35 +0000 (11:36 -0400)]
Set CMS page title from Angular

9 years agoMerge pull request #7072 from monishdeb/CRM-17457
Dave Greenberg [Fri, 30 Oct 2015 18:56:53 +0000 (11:56 -0700)]
Merge pull request #7072 from monishdeb/CRM-17457

CRM-17457 fix - Enotices when skip participant is used

9 years agocomposer.json - Add iATS extension
Tim Otten [Fri, 30 Oct 2015 18:36:09 +0000 (11:36 -0700)]
composer.json - Add iATS extension

9 years agoCRM-16373 - Settings - Fix default for ext_repo_url
Tim Otten [Fri, 30 Oct 2015 17:57:09 +0000 (10:57 -0700)]
CRM-16373 - Settings - Fix default for ext_repo_url

9 years agoMerge pull request #7078 from colemanw/qs
colemanw [Fri, 30 Oct 2015 17:08:57 +0000 (13:08 -0400)]
Merge pull request #7078 from colemanw/qs

EntityRef filter UI fixes

9 years agoMerge pull request #7086 from jitendrapurohit/webtest47
Monish Deb [Fri, 30 Oct 2015 14:40:21 +0000 (20:10 +0530)]
Merge pull request #7086 from jitendrapurohit/webtest47

webtest fix for CRM-17182

9 years agoadditional notices on enabling tax invoice
monishdeb [Fri, 30 Oct 2015 14:18:42 +0000 (19:48 +0530)]
additional notices on enabling tax invoice

9 years agoMerge pull request #7087 from sudhabisht/webtest2Fix
Monish Deb [Fri, 30 Oct 2015 14:03:29 +0000 (19:33 +0530)]
Merge pull request #7087 from sudhabisht/webtest2Fix

Webtest2 fix

9 years agoMinor fix
Sudha Bisht [Fri, 30 Oct 2015 13:59:26 +0000 (19:29 +0530)]
Minor fix

9 years agoWebtestFix2
Sudha Bisht [Fri, 30 Oct 2015 13:57:16 +0000 (19:27 +0530)]
WebtestFix2

9 years agowebtest fix for CRM-17182
jitendrapurohit [Fri, 30 Oct 2015 13:21:13 +0000 (18:51 +0530)]
webtest fix for CRM-17182

9 years agoWebtest fix
Web Access [Fri, 30 Oct 2015 13:15:00 +0000 (18:45 +0530)]
Webtest fix

9 years agoMerge pull request #7079 from monishdeb/testFailures
Yashodha Chaku [Fri, 30 Oct 2015 11:53:23 +0000 (17:23 +0530)]
Merge pull request #7079 from monishdeb/testFailures

4.7beta1 Webtest fixes for Event

9 years agoMerge pull request #7083 from yashodha/CRM-17181
Yashodha Chaku [Fri, 30 Oct 2015 11:45:02 +0000 (17:15 +0530)]
Merge pull request #7083 from yashodha/CRM-17181

rename Participant Fee to avoid confusion w/ contribution fee amount …

9 years agofixes for profile
monishdeb [Fri, 30 Oct 2015 11:34:48 +0000 (17:04 +0530)]
fixes for profile

9 years agorename Participant Fee to avoid confusion w/ contribution fee amount in the event...
yashodha [Fri, 30 Oct 2015 09:33:53 +0000 (15:03 +0530)]
rename Participant Fee to avoid confusion w/ contribution fee amount in the event report

9 years agoMerge pull request #7082 from yashodha/fixCRM-17461
Yashodha Chaku [Fri, 30 Oct 2015 09:16:00 +0000 (14:46 +0530)]
Merge pull request #7082 from yashodha/fixCRM-17461

CRM-17461: Contribution Batch Entry : eNotices and invalid / missing …

9 years agoCRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
yashodha [Fri, 30 Oct 2015 09:08:37 +0000 (14:38 +0530)]
CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data

----------------------------------------
* CRM-17461: Contribution Batch Entry : eNotices and invalid / missing receipt data
  https://issues.civicrm.org/jira/browse/CRM-17461

9 years ago4.7beta1 Webtest fixes for Event
monishdeb [Fri, 30 Oct 2015 07:26:43 +0000 (12:56 +0530)]
4.7beta1 Webtest fixes for Event

9 years agoMerge pull request #7062 from yashodha/CRM-17331
Yashodha Chaku [Fri, 30 Oct 2015 06:00:08 +0000 (11:30 +0530)]
Merge pull request #7062 from yashodha/CRM-17331

CRM-17331: Mass SMSes are not being sent, even though send schedules …

9 years agoMerge pull request #7075 from rohankatkar/Master_webtests
Monish Deb [Fri, 30 Oct 2015 05:03:20 +0000 (10:33 +0530)]
Merge pull request #7075 from rohankatkar/Master_webtests

Webtest Fix for Import

9 years agoEntityRef filter UI fixes
Coleman Watts [Fri, 30 Oct 2015 00:30:52 +0000 (20:30 -0400)]
EntityRef filter UI fixes

9 years agoCRM-17466 - Refine error message
Tim Otten [Thu, 29 Oct 2015 21:08:24 +0000 (14:08 -0700)]
CRM-17466 - Refine error message

9 years agoWebtest Fix for Import
Web Access [Thu, 29 Oct 2015 13:18:18 +0000 (18:48 +0530)]
Webtest Fix for Import

9 years agoCRM-17433 - Invalid error message on deleting Participant record if NOT in pop-up...
jitendrapurohit [Thu, 29 Oct 2015 12:45:11 +0000 (18:15 +0530)]
CRM-17433 - Invalid error message on deleting Participant record if NOT in pop-up form

9 years agoCRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job complet...
yashodha [Thu, 29 Oct 2015 09:35:34 +0000 (15:05 +0530)]
CRM-17331: Mass SMSes are not being sent, even though send schedules SMS -job completes without errors

----------------------------------------
* CRM-17331: Mass SMSes are not being sent, even though "send schedules SMS"-job completes without errors
  https://issues.civicrm.org/jira/browse/CRM-17331

9 years agoMerge pull request #7071 from davecivicrm/CRM-17032
Kurund Jalmi [Thu, 29 Oct 2015 07:22:03 +0000 (12:52 +0530)]
Merge pull request #7071 from davecivicrm/CRM-17032

CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail…

9 years agoCRM-17457 fix - Enotices when skip participant is used
monishdeb [Thu, 29 Oct 2015 06:19:27 +0000 (11:49 +0530)]
CRM-17457 fix - Enotices when skip participant is used

https://issues.civicrm.org/jira/browse/CRM-17457

9 years agoCRM-17032 - Add totals for Fees and Net Amount to Contribution Detail Report.
Dave Greenberg [Thu, 29 Oct 2015 00:21:40 +0000 (17:21 -0700)]
CRM-17032 - Add totals for Fees and Net Amount to Contribution Detail Report.

----------------------------------------
* CRM-17032: Add Fees and Net to Statistics of Contribution Detail Report
  https://issues.civicrm.org/jira/browse/CRM-17032

9 years agoMerge pull request #7070 from davecivicrm/CRM-17425
Dave Greenberg [Wed, 28 Oct 2015 23:53:27 +0000 (16:53 -0700)]
Merge pull request #7070 from davecivicrm/CRM-17425

Crm 17425

9 years agoMerge pull request #7063 from monishdeb/CRM-17434
Dave Greenberg [Wed, 28 Oct 2015 23:24:01 +0000 (16:24 -0700)]
Merge pull request #7063 from monishdeb/CRM-17434

CRM-17434 fix - Free event registration with 'skip confirmation' thro…

9 years agoCRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGrou...
Dave Greenberg [Wed, 28 Oct 2015 22:55:03 +0000 (15:55 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.

----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
  https://issues.civicrm.org/jira/browse/CRM-17425

9 years agoMerge pull request #7067 from eileenmcnaughton/uf_field
Dave Greenberg [Wed, 28 Oct 2015 22:17:49 +0000 (15:17 -0700)]
Merge pull request #7067 from eileenmcnaughton/uf_field

Fix form-call to uf_field:add to reflect new standardised fn signature

9 years agoCRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGrou...
Dave Greenberg [Wed, 28 Oct 2015 22:14:59 +0000 (15:14 -0700)]
CRM-17425 - Help improvement for Batch Entry and fix selectedChild behavior in UFGroup tabset.

----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
  https://issues.civicrm.org/jira/browse/CRM-17425

9 years agoMerge pull request #7010 from agh1/pcp-profile
Dave Greenberg [Wed, 28 Oct 2015 22:10:25 +0000 (15:10 -0700)]
Merge pull request #7010 from agh1/pcp-profile

CRM-17425 Handle PCP fields on contribution batch entry

9 years agoCRM-13823 - More descriptive titles for upgrade messages
Coleman Watts [Wed, 28 Oct 2015 15:36:00 +0000 (11:36 -0400)]
CRM-13823 - More descriptive titles for upgrade messages

9 years agoMerge pull request #7068 from rohankatkar/Webtest-Master
Kurund Jalmi [Wed, 28 Oct 2015 15:08:46 +0000 (20:38 +0530)]
Merge pull request #7068 from rohankatkar/Webtest-Master

Webtest fix for master

9 years agoWebtest fix
Web Access [Wed, 28 Oct 2015 13:23:34 +0000 (18:53 +0530)]
Webtest fix

9 years agoCRM-17434 fix - Free event registration with 'skip confirmation' throws warning
monishdeb [Wed, 28 Oct 2015 08:34:25 +0000 (14:04 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning

https://issues.civicrm.org/jira/browse/CRM-17434

9 years agoMerge pull request #7066 from eileenmcnaughton/CRM-17120-2
Kurund Jalmi [Wed, 28 Oct 2015 06:11:00 +0000 (11:41 +0530)]
Merge pull request #7066 from eileenmcnaughton/CRM-17120-2

CRM-17120 remove calls to uncached function

9 years agoMerge pull request #7064 from rohankatkar/Webtest-Fix-Master
Kurund Jalmi [Wed, 28 Oct 2015 06:09:57 +0000 (11:39 +0530)]
Merge pull request #7064 from rohankatkar/Webtest-Fix-Master

Webtest Fix- Master

9 years agoFix form-call to uf_field:add to reflect new standardised fn signature
eileen [Wed, 28 Oct 2015 00:56:58 +0000 (13:56 +1300)]
Fix form-call to uf_field:add to reflect new standardised fn signature

9 years agoMerge pull request #7065 from colemanw/wysiwyg
colemanw [Wed, 28 Oct 2015 00:44:15 +0000 (20:44 -0400)]
Merge pull request #7065 from colemanw/wysiwyg

wysiwyg cleanup

9 years agoCRM-17120 remove calls to uncached function
eileen [Wed, 28 Oct 2015 00:11:49 +0000 (13:11 +1300)]
CRM-17120 remove calls to uncached function

9 years agoMerge pull request #7037 from seamuslee001/CRM-17436
Dave Greenberg [Tue, 27 Oct 2015 23:15:00 +0000 (16:15 -0700)]
Merge pull request #7037 from seamuslee001/CRM-17436

CRM-17436 Make the Date and time filter on ContributionAggregate sear…

9 years agoMerge pull request #7058 from eileenmcnaughton/merge-test
Eileen McNaughton [Tue, 27 Oct 2015 22:27:11 +0000 (11:27 +1300)]
Merge pull request #7058 from eileenmcnaughton/merge-test

Add test for contact.merge action

9 years agoMerge pull request #7060 from eileenmcnaughton/CRM-17256-paypal
Eileen McNaughton [Tue, 27 Oct 2015 22:26:45 +0000 (11:26 +1300)]
Merge pull request #7060 from eileenmcnaughton/CRM-17256-paypal

CRM-17256 Show / bounce on  paypal express errors

9 years agoCRM-16354 - use crm-wysiwyg-enabled css class more reliably
Coleman Watts [Tue, 27 Oct 2015 19:32:17 +0000 (15:32 -0400)]
CRM-16354 - use crm-wysiwyg-enabled css class more reliably

9 years agoCRM-16354 - Add sanity check
Coleman Watts [Tue, 27 Oct 2015 19:12:26 +0000 (15:12 -0400)]
CRM-16354 - Add sanity check

9 years agoMerge pull request #7061 from eileenmcnaughton/CRM-17397
Dave Greenberg [Tue, 27 Oct 2015 18:52:08 +0000 (11:52 -0700)]
Merge pull request #7061 from eileenmcnaughton/CRM-17397

CRM-17397 enotice fix