civicrm-core.git
9 years agoCRM-16847 - Fix for addressee and greeting related contact export bug
Joseph Lacey [Tue, 14 Jul 2015 18:14:08 +0000 (14:14 -0400)]
CRM-16847 - Fix for addressee and greeting related contact export bug

----------------------------------------
* CRM-16847: Greeting and Address tokens not properly rendered when exporting related contacts from a contrbution search.
  https://issues.civicrm.org/jira/browse/CRM-16847

9 years agoMerge pull request #5520 from totten/4.6-cxn
Tim Otten [Tue, 14 Jul 2015 07:05:53 +0000 (00:05 -0700)]
Merge pull request #5520 from totten/4.6-cxn

CRM-16173 - System for simple, secure API keys

9 years agoMerge pull request #6202 from jitendrapurohit/CRM-16823
Monish Deb [Tue, 14 Jul 2015 05:24:03 +0000 (10:54 +0530)]
Merge pull request #6202 from jitendrapurohit/CRM-16823

CRM-16823 - Contact Image does not display on contact summary screen …

9 years agoMerge pull request #6198 from Seb35/4.6
Yashodha Chaku [Tue, 14 Jul 2015 05:02:17 +0000 (10:32 +0530)]
Merge pull request #6198 from Seb35/4.6

CRM-16824: Unrecognized date format in custom fields during import of…

9 years agoCRM-16173 - ManageCtrl - Display errors about AppMetas
Tim Otten [Wed, 8 Jul 2015 00:21:20 +0000 (17:21 -0700)]
CRM-16173 - ManageCtrl - Display errors about AppMetas

9 years agoCRM-16757 - Cache CiviConnect apps and CRLs.
Tim Otten [Sat, 4 Jul 2015 01:17:03 +0000 (18:17 -0700)]
CRM-16757 - Cache CiviConnect apps and CRLs.

9 years agoCRM_Utils_Array::rekey()
Tim Otten [Sat, 4 Jul 2015 01:15:44 +0000 (18:15 -0700)]
CRM_Utils_Array::rekey()

9 years agoCRM-16760 - Remove CIVICRM_CXN_APPS_VERIFY constraint
Tim Otten [Fri, 3 Jul 2015 22:28:30 +0000 (15:28 -0700)]
CRM-16760 - Remove CIVICRM_CXN_APPS_VERIFY constraint

9 years agoCRM-16757 - Use customized CertificateValidator
Tim Otten [Tue, 30 Jun 2015 23:21:10 +0000 (16:21 -0700)]
CRM-16757 - Use customized CertificateValidator

9 years agoCRM-16757 - Split extern/cxn.php into createApiServer() and CRM_Cxn_ApiRouter
Tim Otten [Tue, 30 Jun 2015 23:11:10 +0000 (16:11 -0700)]
CRM-16757 - Split extern/cxn.php into createApiServer() and CRM_Cxn_ApiRouter

9 years agocrmCxnManageCtrl - Show links for settings, docs, support, logs
Tim Otten [Mon, 29 Jun 2015 07:23:39 +0000 (00:23 -0700)]
crmCxnManageCtrl - Show links for settings, docs, support, logs

9 years agoCrmCxnLinkDialogCtrl - Add ctrl to show an external link in a dialog
Tim Otten [Mon, 29 Jun 2015 07:22:59 +0000 (00:22 -0700)]
CrmCxnLinkDialogCtrl - Add ctrl to show an external link in a dialog

9 years agoCxn.getlink API
Tim Otten [Mon, 29 Jun 2015 05:44:37 +0000 (22:44 -0700)]
Cxn.getlink API

9 years agoapi/v3/Cxn - Tweak error
Tim Otten [Fri, 19 Jun 2015 03:24:54 +0000 (20:24 -0700)]
api/v3/Cxn - Tweak error

9 years agoCRM-16173 - extern/cxn.php - Respect the "Force SSL" option
Tim Otten [Sat, 11 Apr 2015 22:58:58 +0000 (15:58 -0700)]
CRM-16173 - extern/cxn.php - Respect the "Force SSL" option

9 years agoJobLog.get API
Tim Otten [Sat, 11 Apr 2015 03:40:10 +0000 (20:40 -0700)]
JobLog.get API

9 years agoCRM-16173 - Cxn.get API - Hide 'secret'
Tim Otten [Fri, 10 Apr 2015 06:03:18 +0000 (23:03 -0700)]
CRM-16173 - Cxn.get API - Hide 'secret'

9 years agoCRM-16173 - crmCxn - Add UI for connecting and disconnecting
Tim Otten [Fri, 27 Mar 2015 11:08:04 +0000 (04:08 -0700)]
CRM-16173 - crmCxn - Add UI for connecting and disconnecting

 * Split available and actual connections
 * Display alert if sysadmin disables Cxn security
 * Display permissions when confirming

9 years agoCRM-16173 - CRM_Core_Permission_Temp, extern/cxn.php - Allow temporary permission...
Tim Otten [Mon, 30 Mar 2015 06:46:18 +0000 (23:46 -0700)]
CRM-16173 - CRM_Core_Permission_Temp, extern/cxn.php - Allow temporary permission escalation

9 years agoCRM-16173 - WhitelistSubscriber - Filtering for API requests (entity/action/params)
Tim Otten [Sat, 28 Mar 2015 03:27:05 +0000 (20:27 -0700)]
CRM-16173 - WhitelistSubscriber - Filtering for API requests (entity/action/params)

9 years agoCRM-16173 - Fix for SyntaxConformanceTest
Tim Otten [Fri, 27 Mar 2015 08:10:21 +0000 (01:10 -0700)]
CRM-16173 - Fix for SyntaxConformanceTest

9 years agoCRM-16173 - Allow define()s for CIVICRM_CXN_APPS_VERIFY and CIVICRM_CXN_APPS_URL
Tim Otten [Sat, 28 Mar 2015 23:48:08 +0000 (16:48 -0700)]
CRM-16173 - Allow define()s for CIVICRM_CXN_APPS_VERIFY and CIVICRM_CXN_APPS_URL

9 years agoCxn.register - Fix for multiple CxnApp
Tim Otten [Tue, 31 Mar 2015 07:32:56 +0000 (00:32 -0700)]
Cxn.register - Fix for multiple CxnApp

9 years agoCRM-16173 - Cxn API - Add "get". Fix GUID fields and API metadata.
Tim Otten [Fri, 27 Mar 2015 08:10:11 +0000 (01:10 -0700)]
CRM-16173 - Cxn API - Add "get". Fix GUID fields and API metadata.

APIv3 overloads fields like "cxn_id" as aliases for numeric "id". Therefore,
it's problematic to use "cxn_id" and "app_id" as GUID fields.  This commit
renames them to "cxn_guid" and "app_guid".

9 years agoCRM_Cxn_BAO_Cxn - Comments
Tim Otten [Fri, 27 Mar 2015 07:32:17 +0000 (00:32 -0700)]
CRM_Cxn_BAO_Cxn - Comments

9 years agoCRM-16173 - CxnApp.get API
Tim Otten [Fri, 27 Mar 2015 07:30:25 +0000 (00:30 -0700)]
CRM-16173 - CxnApp.get API

9 years agoCRM-16173 - Rename createCACert() to getCACert().
Tim Otten [Fri, 27 Mar 2015 03:05:58 +0000 (20:05 -0700)]
CRM-16173 - Rename createCACert() to getCACert().

9 years agocomposer.json - Update civicrm/civicrm-cxn-rpc. Fix handleAndRespond().
Tim Otten [Fri, 27 Mar 2015 02:52:56 +0000 (19:52 -0700)]
composer.json - Update civicrm/civicrm-cxn-rpc. Fix handleAndRespond().

9 years agoCRM-16173 - CIVICRM_CXN_VERIFY => CIVICRM_CXN_CA, CIVICRM_CXN_VERIFY_APPMETA
Tim Otten [Thu, 26 Mar 2015 23:50:41 +0000 (16:50 -0700)]
CRM-16173 - CIVICRM_CXN_VERIFY => CIVICRM_CXN_CA, CIVICRM_CXN_VERIFY_APPMETA

The CA may take one of three values - CiviRootCA, CiviTestRootCA, or none.

In the future, this may help with staging and private-beta apps.

9 years agoCRM-16173 - Cxn.unregister API
Tim Otten [Wed, 25 Mar 2015 11:27:52 +0000 (04:27 -0700)]
CRM-16173 - Cxn.unregister API

9 years agoCRM-16173 - Move construction of RegistrationClient to container
Tim Otten [Wed, 25 Mar 2015 05:46:56 +0000 (22:46 -0700)]
CRM-16173 - Move construction of RegistrationClient to container

9 years agoCRM-16173 - Add Cxn.register API. Add extern/cxn.php endpoint.
Tim Otten [Tue, 24 Mar 2015 23:49:54 +0000 (16:49 -0700)]
CRM-16173 - Add Cxn.register API. Add extern/cxn.php endpoint.

9 years agoCRM-16173 - xml/schema/Cxn - Schema + upgrade for storing connections
Tim Otten [Sun, 22 Mar 2015 05:55:21 +0000 (22:55 -0700)]
CRM-16173 - xml/schema/Cxn - Schema + upgrade for storing connections

9 years agocomposer.json - Add civicrm-cxn-rpc
Tim Otten [Sat, 21 Mar 2015 03:44:10 +0000 (20:44 -0700)]
composer.json - Add civicrm-cxn-rpc

9 years agoAdd angular-sanitize
Tim Otten [Fri, 10 Apr 2015 02:22:47 +0000 (19:22 -0700)]
Add angular-sanitize

9 years agoCore.setting.php - Expose enableSSL
Tim Otten [Sat, 11 Apr 2015 22:59:51 +0000 (15:59 -0700)]
Core.setting.php - Expose enableSSL

9 years agoExtension.get API - Add support for API filters/options
Tim Otten [Fri, 10 Apr 2015 02:51:00 +0000 (19:51 -0700)]
Extension.get API - Add support for API filters/options

9 years agoSystem.get API - Return system details (PHP+MySQL version, ad nauseum)
Tim Otten [Fri, 10 Apr 2015 03:54:52 +0000 (20:54 -0700)]
System.get API - Return system details (PHP+MySQL version, ad nauseum)

Includes:
 * Civi+PHP+MySQL versions
 * Active components/extensions/modules
 * Redacted PHP INI settings

9 years ago_civicrm_api3_basic_array_get - Helper for simple array-backed APIs
Tim Otten [Fri, 27 Mar 2015 07:00:11 +0000 (00:00 -0700)]
_civicrm_api3_basic_array_get - Helper for simple array-backed APIs

Suppose you have a small/mid-sized list of records (from JSON, XML, YAML,
etc) and want to expose an API for filtering them.  You could make a new
table and new DAO/BAO and then call _civicrm_api3_basic_get, but
_civicrm_api3_basic_array_get would be so much simpler.

9 years agoCivi\API\Request - Make normalize*() less manic-side-effect-y.
Tim Otten [Sat, 28 Mar 2015 03:47:20 +0000 (20:47 -0700)]
Civi\API\Request - Make normalize*() less manic-side-effect-y.

9 years agoCivi\API\Subscriber\ChainSubscriber - Reuse the inputted kernel, not the global kernel.
Tim Otten [Sat, 28 Mar 2015 03:25:24 +0000 (20:25 -0700)]
Civi\API\Subscriber\ChainSubscriber - Reuse the inputted kernel, not the global kernel.

9 years agoCivi\API\Event - Pass through the $apiKernel
Tim Otten [Sat, 28 Mar 2015 01:22:59 +0000 (18:22 -0700)]
Civi\API\Event - Pass through the $apiKernel

9 years agoMerge pull request #6126 from rohankatkar/CRM-16777
Dave Greenberg [Mon, 13 Jul 2015 18:03:39 +0000 (11:03 -0700)]
Merge pull request #6126 from rohankatkar/CRM-16777

CRM-16777: Allow users who can configure an event to also configure scheduled reminders for that event

9 years agoMerge pull request #6050 from eileenmcnaughton/CRM-16717
Dave Greenberg [Mon, 13 Jul 2015 17:01:53 +0000 (10:01 -0700)]
Merge pull request #6050 from eileenmcnaughton/CRM-16717

CRM-16717 alter logging table field length when altering custom table…

9 years agoChanges to CRM-16777
Web Access [Mon, 13 Jul 2015 15:56:13 +0000 (21:26 +0530)]
Changes to CRM-16777

9 years agoMerge pull request #6182 from monishdeb/46test
Monish Deb [Mon, 13 Jul 2015 13:37:46 +0000 (19:07 +0530)]
Merge pull request #6182 from monishdeb/46test

CRM-16711 fix - contact details accessible v…

9 years agoQA changes
monishdeb [Mon, 13 Jul 2015 10:11:59 +0000 (15:41 +0530)]
QA changes

9 years agominor fix
monishdeb [Fri, 10 Jul 2015 18:35:20 +0000 (00:05 +0530)]
minor fix

9 years agoCRM-16711 fix - Security breach of data: contact details accessible via relationships
monishdeb [Thu, 9 Jul 2015 20:38:09 +0000 (02:08 +0530)]
CRM-16711 fix - Security breach of data: contact details accessible via relationships

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

9 years agoMerge pull request #6178 from xurizaemon/CRM-16821
Kurund Jalmi [Mon, 13 Jul 2015 09:31:10 +0000 (15:01 +0530)]
Merge pull request #6178 from xurizaemon/CRM-16821

CRM-16821

9 years agoModifications to CRM-16777
Web Access [Mon, 13 Jul 2015 09:26:25 +0000 (14:56 +0530)]
Modifications to CRM-16777

9 years agoMerge pull request #6187 from yashodha/CRM-16814
Yashodha Chaku [Mon, 13 Jul 2015 08:35:25 +0000 (14:05 +0530)]
Merge pull request #6187 from yashodha/CRM-16814

CRM-16814: Scheduled Activity on a second case is deleted when the op…

9 years agoCRM-16823 - Contact Image does not display on contact summary screen when loaded...
jitendrapurohit [Mon, 13 Jul 2015 07:25:37 +0000 (12:55 +0530)]
CRM-16823 - Contact Image does not display on contact summary screen when loaded via a profile

9 years agoCRM-16824: Unrecognized date format in custom fields during import of contributions
Seb35 [Sat, 11 Jul 2015 16:59:36 +0000 (18:59 +0200)]
CRM-16824: Unrecognized date format in custom fields during import of contributions

During import of contributions, the contact type was not explicely set, leading to
misrecognized contribution custom fields. This was fixed by comparing with the
pre-import (summary) function, and tested on a real import of contributions with custom
fields.

9 years agoMerge pull request #6195 from colemanw/Fix
colemanw [Fri, 10 Jul 2015 19:06:04 +0000 (15:06 -0400)]
Merge pull request #6195 from colemanw/Fix

Fix contact sub-type profile field to use select2

9 years agoFix contact sub-type profile field to use select2
Coleman Watts [Fri, 10 Jul 2015 19:05:34 +0000 (15:05 -0400)]
Fix contact sub-type profile field to use select2

9 years agoMerge pull request #6183 from lsmithgo/patch-1
Dave Greenberg [Fri, 10 Jul 2015 15:36:31 +0000 (08:36 -0700)]
Merge pull request #6183 from lsmithgo/patch-1

Update Joomla.php

9 years agoMerge pull request #6192 from colemanw/CRM-16825
colemanw [Fri, 10 Jul 2015 15:30:41 +0000 (11:30 -0400)]
Merge pull request #6192 from colemanw/CRM-16825

CRM-16825 - Respect quicksearch result count setting

9 years agoCRM-16825 - Respect quicksearch result count setting
Coleman Watts [Fri, 10 Jul 2015 15:28:14 +0000 (11:28 -0400)]
CRM-16825 - Respect quicksearch result count setting

9 years agoMerge pull request #6141 from monishdeb/4.6
Dave Greenberg [Fri, 10 Jul 2015 14:42:10 +0000 (07:42 -0700)]
Merge pull request #6141 from monishdeb/4.6

CRM-16483 fix - Fix search builder to accept all operators with conta… …

9 years agoWarning fix
Web Access [Fri, 10 Jul 2015 13:13:15 +0000 (18:43 +0530)]
Warning fix

9 years agoAdditional changes
Web Access [Fri, 10 Jul 2015 13:06:17 +0000 (18:36 +0530)]
Additional changes

9 years agowebtest for CRM-16777
Web Access [Tue, 7 Jul 2015 10:14:50 +0000 (15:44 +0530)]
webtest for CRM-16777

9 years agoFix for CRM-16777
Web Access [Thu, 2 Jul 2015 15:50:39 +0000 (21:20 +0530)]
Fix for CRM-16777

9 years agoMerge pull request #6133 from jitendrapurohit/CRM-16796
Monish Deb [Fri, 10 Jul 2015 12:18:47 +0000 (17:48 +0530)]
Merge pull request #6133 from jitendrapurohit/CRM-16796

CRM-16796 - Add ACL support for profile related api's

9 years agoCRM-16814: Scheduled Activity on a second case is deleted when the open date on the...
yashodha [Fri, 10 Jul 2015 09:57:44 +0000 (15:27 +0530)]
CRM-16814: Scheduled Activity on a second case is deleted when the open date on the first case is changed

----------------------------------------
* CRM-16814: Scheduled Activity on a second case is deleted when the open date on the first case is changed
  https://issues.civicrm.org/jira/browse/CRM-16814

9 years agowarning fixes
jitendrapurohit [Tue, 7 Jul 2015 11:44:42 +0000 (17:14 +0530)]
warning fixes

9 years agowebtest for CRM-16796 and CRM-16776
jitendrapurohit [Tue, 7 Jul 2015 09:51:48 +0000 (15:21 +0530)]
webtest for CRM-16796 and CRM-16776

9 years agoapi test for CRM-16796
jitendrapurohit [Tue, 7 Jul 2015 09:49:06 +0000 (15:19 +0530)]
api test for CRM-16796

9 years agostyle fix
jitendrapurohit [Mon, 6 Jul 2015 04:33:31 +0000 (10:03 +0530)]
style fix

9 years agoCRM-16796 - Add ACL support for profile related api's
jitendrapurohit [Fri, 3 Jul 2015 13:34:20 +0000 (19:04 +0530)]
CRM-16796 - Add ACL support for profile related api's

9 years agoMerge pull request #6150 from eileenmcnaughton/CRM-16803
Eileen McNaughton [Fri, 10 Jul 2015 02:14:35 +0000 (14:14 +1200)]
Merge pull request #6150 from eileenmcnaughton/CRM-16803

CRM-16803 fix non-creating on recurring contributio record on members…

9 years agoUpdate Joomla.php
lsmithgo [Thu, 9 Jul 2015 22:43:38 +0000 (23:43 +0100)]
Update Joomla.php

One word fix to CRM-16827 for redirection to login page and back during event registration

9 years agoCRM-16803 QA fixes
Eileen McNaughton [Thu, 9 Jul 2015 21:26:59 +0000 (09:26 +1200)]
CRM-16803 QA fixes

9 years agoMerge pull request #6160 from eileenmcnaughton/CRM-16737
Yashodha Chaku [Thu, 9 Jul 2015 14:03:37 +0000 (19:33 +0530)]
Merge pull request #6160 from eileenmcnaughton/CRM-16737

CRM-16737 support either payment_status_id OR contribution_status_id

9 years agominor fix
monishdeb [Thu, 9 Jul 2015 11:46:47 +0000 (17:16 +0530)]
minor fix

9 years agoCRM-16821. Improve output escaping from CRM_Core_Error.
Chris Burgess [Thu, 9 Jul 2015 04:51:22 +0000 (16:51 +1200)]
CRM-16821. Improve output escaping from CRM_Core_Error.

9 years agoadd smartGroup title in select clause
monishdeb [Wed, 8 Jul 2015 09:21:36 +0000 (14:51 +0530)]
add smartGroup title in select clause

9 years agoreverted chcanges
monishdeb [Sat, 4 Jul 2015 14:51:50 +0000 (20:21 +0530)]
reverted chcanges

9 years agoapi failure fixes
monishdeb [Sat, 4 Jul 2015 14:30:02 +0000 (20:00 +0530)]
api failure fixes

9 years agoformatting fix
monishdeb [Fri, 3 Jul 2015 14:19:26 +0000 (19:49 +0530)]
formatting fix

9 years agoCRM-16483 fix - Fix search builder to accept all operators with contact groups
monishdeb [Fri, 3 Jul 2015 14:02:38 +0000 (19:32 +0530)]
CRM-16483 fix - Fix search builder to accept all operators with contact groups

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

Conflicts:
CRM/Contact/BAO/Query.php

9 years agoCRM-16821. Escape output from Authorize IPN.
Chris Burgess [Thu, 9 Jul 2015 04:02:23 +0000 (16:02 +1200)]
CRM-16821. Escape output from Authorize IPN.

9 years agoCRM-16717 trim prefix field as it might have syntactical space
Eileen McNaughton [Thu, 9 Jul 2015 00:33:37 +0000 (12:33 +1200)]
CRM-16717 trim prefix field as it might have syntactical space

9 years agoCRM-16717 consider length of fields when comparing schema when turning logging on
Eileen McNaughton [Thu, 18 Jun 2015 00:33:28 +0000 (12:33 +1200)]
CRM-16717 consider length of fields when comparing schema when turning logging on
If a field length has increased we need to ensure the field length of the log table is also increased

9 years agoCRM-16717 alter logging table field length when altering custom table field length
Eileen McNaughton [Wed, 17 Jun 2015 23:50:42 +0000 (11:50 +1200)]
CRM-16717 alter logging table field length when altering custom table field length

9 years agoMerge pull request #6121 from jitendrapurohit/CRM-16776
Dave Greenberg [Thu, 9 Jul 2015 00:22:50 +0000 (17:22 -0700)]
Merge pull request #6121 from jitendrapurohit/CRM-16776

CRM-16776 - Event-related profiles can be created & edited with either 'administe…

9 years agoMerge pull request #6172 from colemanw/CRM-16811
Dave Greenberg [Wed, 8 Jul 2015 21:42:50 +0000 (14:42 -0700)]
Merge pull request #6172 from colemanw/CRM-16811

CRM-16811 - Support markup fields in popup profile editor

9 years agoCRM-16811 - Support markup fields in popup profile editor
Coleman Watts [Wed, 8 Jul 2015 17:52:13 +0000 (13:52 -0400)]
CRM-16811 - Support markup fields in popup profile editor

9 years agoProfile editor - Sort/drag usability fix
Coleman Watts [Wed, 8 Jul 2015 17:44:06 +0000 (13:44 -0400)]
Profile editor - Sort/drag usability fix

9 years agoMerge pull request #6169 from yashodha/webtest-skip
Yashodha Chaku [Wed, 8 Jul 2015 15:52:43 +0000 (21:22 +0530)]
Merge pull request #6169 from yashodha/webtest-skip

skipping webtests that are working locally and not on Jenkins

9 years agoMerge pull request #6114 from seamuslee001/civi_permission
Monish Deb [Wed, 8 Jul 2015 12:47:41 +0000 (18:17 +0530)]
Merge pull request #6114 from seamuslee001/civi_permission

Deal with ACL'ed users not getting is_deleted = 0 added on

9 years agoMerge pull request #6158 from monishdeb/46test
Yashodha Chaku [Wed, 8 Jul 2015 10:09:53 +0000 (15:39 +0530)]
Merge pull request #6158 from monishdeb/46test

CRM-16804 fix - Contribution updated via api wrongfully deletes PCP s…

9 years agoskipping webtests that are working locally and not on Jenkins
yashodha [Wed, 8 Jul 2015 09:15:59 +0000 (14:45 +0530)]
skipping webtests that are working locally and not on Jenkins

9 years agocheck for manage event profile permission on preview
jitendrapurohit [Wed, 8 Jul 2015 09:09:49 +0000 (14:39 +0530)]
check for manage event profile permission on preview

9 years agoCRM-16737 further fix as test showed now quite right
eileenmcnaughton [Wed, 8 Jul 2015 02:55:54 +0000 (02:55 +0000)]
CRM-16737 further fix as test showed now quite right

9 years agoCRM-16737 code coments
Eileen McNaughton [Tue, 7 Jul 2015 10:35:33 +0000 (22:35 +1200)]
CRM-16737 code coments

9 years agoCRM-16737, CRM-15296 support for payment_status_id as the new official way to
Eileen McNaughton [Tue, 7 Jul 2015 10:25:11 +0000 (22:25 +1200)]
CRM-16737, CRM-15296 support for payment_status_id as the new official way to
declare outcome of payment transaction

9 years agominor fix
monishdeb [Tue, 7 Jul 2015 10:28:46 +0000 (15:58 +0530)]
minor fix

9 years agoCRM-16737 spport either payment_status_id OR contribution_status_id as processor...
Eileen McNaughton [Tue, 7 Jul 2015 10:16:53 +0000 (22:16 +1200)]
CRM-16737 spport either payment_status_id OR contribution_status_id as processor return status
In 4.6 the idea is a payment processor can return payment_status_id or contribution_status_id to denote outcome of
payment, in 4.7 contribution_status_id is to be removed