jenkins-bot has submitted this change and it was merged. Change subject: Annotate CiviCRM patches ......................................................................
Annotate CiviCRM patches Add comments about CiviCRM patches to the patches to indicate upgrade thoughts Bug: T99836 Change-Id: If26d079a2adb63d1999982669914d76f139a71e2 --- A patches/README.md M patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch M patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch M patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch M patches/civicrm-4.2.19-drupal-wmf-api.patch M patches/civicrm-4.2.19-drupal-wmf-big-fields.patch M patches/civicrm-4.2.19-drupal-wmf-custom-names.patch M patches/civicrm-4.2.19-drupal-wmf-dateadded.patch M patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch M patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch M patches/civicrm-4.2.19-drupal-wmf-dedupe.patch M patches/civicrm-4.2.19-drupal-wmf-delete.patch M patches/civicrm-4.2.19-drupal-wmf-empty-search.patch M patches/civicrm-4.2.19-drupal-wmf-entitytag.patch M patches/civicrm-4.2.19-drupal-wmf-exception.patch M patches/civicrm-4.2.19-drupal-wmf-export.patch M patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch M patches/civicrm-4.2.19-drupal-wmf-failure-info.patch M patches/civicrm-4.2.19-drupal-wmf-greetings.patch M patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch M patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch M patches/civicrm-4.2.19-drupal-wmf-option-cache.patch M patches/civicrm-4.2.19-drupal-wmf-prevnext.patch M patches/civicrm-4.2.19-drupal-wmf-queryopt.patch M patches/civicrm-4.2.19-drupal-wmf-refund.patch M patches/civicrm-4.2.19-drupal-wmf-sort-name.patch M patches/civicrm-4.2.19-drupal-wmf-strict.patch M patches/civicrm-4.2.19-drupal-wmf-style.patch M patches/civicrm-4.2.19-drupal-wmf-triggers.patch M patches/civicrm-4.2.19-drupal-wmf-typo.patch M patches/civicrm-4.2.19-drupal-wmf-typo2.patch 31 files changed, 276 insertions(+), 4 deletions(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/patches/README.md b/patches/README.md new file mode 100644 index 0000000..31dd517 --- /dev/null +++ b/patches/README.md @@ -0,0 +1,69 @@ +Status overview for upgrade: + +===================================================================================================================== +Patches tracked in JIRA - all ported to 4.6 +===================================================================================================================== +big-fields patch CRM-17118 - action required - clarify long postcodes +delete patch CRM-10700 +debug-queries patch #1 CRM-17144 +debug-queries patch #1 CRM-17156 +debug-upgrade patch - Bitcoin part - CRM-17157 +empty-search-patch CRM-17158 +expose-sql patch CRM-17144 (this didn't 100% apply onto 4.6 so need to check - if keeping) +export patch CRM-10675 +language-freeform patch CRM-14232 +option-cache patch CRM-17120 +refund patch CRM-11503 +triggers patch CRM-12315 + +===================================================================================================================== +Patches not currently tracked in JIRA - all ported to 4.6 +===================================================================================================================== +failure patch +greetings patch +prevnext patch + + +===================================================================================================================== +Patches that are likely not to have survived the port +===================================================================================================================== +1) api-patch / exception patch- lot of stuff changed in core. Some stuff ported, some just too different. +2) Report output patches (e.g expose-sql-patch) - quite a lot of change. Potentially finish off CRM-17114 instead +3) Needs to check autocompletes. Note that the quicksearch autocomplete should be fast without the hook now - but +other autocompletes may now by-pass it. + +===================================================================================================================== +Sunset Patches (These patches are ported to 4.6 but with a view to that being the last version they go on.) +===================================================================================================================== +dedupe patch +entity-tag patch +exception patch CRM-14674 (longer term switch to civicrm_api3 in our modules - could do this first too?) +wmf-local (just adds a readme) + +===================================================================================================================== +Patches requiring css changes elsewhere (not ported) +===================================================================================================================== + +style patch - note css has changed substantially since 4.2 & wouldn't apply + +===================================================================================================================== +Patches I propose to drop (not ported) +===================================================================================================================== +acl-cache patch +admin-backport +advanced search patch CRM-10674 +custom-names patch +dateadded patch +debug-upgrade patch - other part... +jcalendar patch +queryopt patch +sort-name patch +strict patch +typo patch +typo2 patch + +===================================================================================================================== +Giant Rabbit report work analysis +===================================================================================================================== +This is currently here +https://docs.google.com/spreadsheets/d/1IcTicTdKwgf62INuTEoRjHZ_5ostMLCnfl6ahn3s8u0/edit#gid=0 diff --git a/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch b/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch index b366af2..1a9543b 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-acl-cache.patch @@ -1,4 +1,12 @@ diff -urN civicrm-4.2.19/CRM/ACL/BAO/ACL.php civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php + +Status: needs confirmation +Recommendation: no further action. +Background: This appears to be primarily about adding caching to the CRM_ACL_BAO_ACL::group function. +In 4.4 there appears to be caching submitted by Adam. + +JIRA: CRM-11275 (tangental I think) + --- civicrm-4.2.19/CRM/ACL/BAO/ACL.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php 2015-03-11 13:31:10.174248480 -0700 @@ -44,6 +44,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch b/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch index bfb5cb9..407094c 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-admin-backport.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/CRM/Admin/Page/Admin.php civicrm-4.2.19-wmf/CRM/Admin/Page/Admin.php + +Status: 4.4 and 4.6 ok +Recommendation: ignore this is already upstream. + --- civicrm-4.2.19/CRM/Admin/Page/Admin.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Admin/Page/Admin.php 2015-03-11 13:31:10.194248479 -0700 @@ -113,6 +113,9 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch b/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch index 8d7bcf3..2c19e00 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-advanced-search.patch @@ -1,4 +1,12 @@ diff -urN civicrm-4.2.19/CRM/Contact/Form/Search.php civicrm-4.2.19-wmf/CRM/Contact/Form/Search.php + +Status: I think this hook (in 4.4) http://wiki.civicrm.org/confluence/display/CRMDOC/hook_civicrm_queryObjects possibly +supercedes this proposed hook. + +Recommendation : grep & make sure the only use is still the commented out one & if so don't port to upgraded version + +JIRA: CRM-10674 + --- civicrm-4.2.19/CRM/Contact/Form/Search.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Form/Search.php 2015-03-11 13:31:10.234248478 -0700 @@ -329,6 +329,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-api.patch b/patches/civicrm-4.2.19-drupal-wmf-api.patch index cad923f..ef633c0 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-api.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-api.patch @@ -1,4 +1,10 @@ diff -urN civicrm-4.2.19/api/api.php civicrm-4.2.19-wmf/api/api.php + +Status: api.php code too changed to apply api wrapper changes. + performance issue being tracked in CRM-17000 +Background: patch is to prevent 'bubble up DB_Error details' +Commit comment: (FR #1066) Overly specific hack to bubble up DB_Error details + --- civicrm-4.2.19/api/api.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/api/api.php 2015-03-11 13:31:10.446248473 -0700 @@ -114,7 +114,7 @@ @@ -34,7 +40,7 @@ @@ -72,6 +72,16 @@ $params['entity_table']['api.default'] = 'civicrm_contact'; } - + +function civicrm_api3_entity_tag_getdetails($params) { + $values = CRM_Core_BAO_EntityTag::getTagDetails($params['entity_id'], $params['entity_table']); + return civicrm_api3_create_success($values, $params); @@ -76,7 +82,7 @@ } @@ -309,22 +323,18 @@ } - + /** - * Recursive function to explode value-separated strings into arrays + * explode value-separated strings into arrays @@ -123,7 +129,7 @@ } $params[$fieldname] = CRM_Utils_Date::processDate($params[$fieldname]); @@ -1222,13 +1232,9 @@ - + return civicrm_api3_create_success($creates, $params); } - catch(PEAR_Exception$e) { @@ -136,4 +142,4 @@ + return civicrm_api3_create_error($e); } } - + diff --git a/patches/civicrm-4.2.19-drupal-wmf-big-fields.patch b/patches/civicrm-4.2.19-drupal-wmf-big-fields.patch index 244ae72..ff5403e 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-big-fields.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-big-fields.patch @@ -1,4 +1,12 @@ diff -urN civicrm-4.2.19/CRM/Core/DAO/Address.php civicrm-4.2.19-wmf/CRM/Core/DAO/Address.php + +Status: review postal_code requirement +Background: 2 patches in here - one for length of email & one for postal_code. The email one is in core for 4.4 and 4.6. +However the postal code is not - if there are legit postal_codes over 12 char then we just need to get the example and +we can upstream it. Stackflow discussion. +http://stackoverflow.com/questions/325041/i-need-to-store-postal-codes-in-a-database-how-big-should-the-column-be +JIRA: CRM-17118 Bug CRM-13326 + --- civicrm-4.2.19/CRM/Core/DAO/Address.php 2014-09-09 15:41:52.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/DAO/Address.php 2015-03-11 13:31:10.286248477 -0700 @@ -459,12 +459,11 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch b/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch index 2807c90..c948d3d 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-custom-names.patch @@ -2,6 +2,12 @@ The change has been upstreamed correctly, abandon this. I donno what the is_view thing was about. + +Recommendation: no further action based on above comments & the seemingly related JIRA being closed. + +JIRA: CRM-10592 +Possibly CRM-10603 too. + diff -urN civicrm-4.2.19/CRM/Core/BAO/CustomField.php civicrm-4.2.19-wmf/CRM/Core/BAO/CustomField.php --- civicrm-4.2.19/CRM/Core/BAO/CustomField.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/BAO/CustomField.php 2015-03-11 13:31:10.274248477 -0700 diff --git a/patches/civicrm-4.2.19-drupal-wmf-dateadded.patch b/patches/civicrm-4.2.19-drupal-wmf-dateadded.patch index 614c616..02e92c9 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-dateadded.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-dateadded.patch @@ -1,4 +1,18 @@ diff -urN civicrm-4.2.19/CRM/Contact/Form/Search/Custom/DateAdded.php civicrm-4.2.19-wmf/CRM/Contact/Form/Search/Custom/DateAdded.php + +Status: No action - let this die a natural patch. +Recommendation: Discard the patch +Background: This looks like the remnants of a patch to me. It alters a custom search to prevent the $justIDS +parameter from working. I originally thought there might be some smart groups using it but then I found this +https://github.com/CiviCRM42/civicrm42-core/commit/e44ebf8dacdb8d6f17d7082c6bcef552fc2bda53 +and I think someone made a boo-boo & wmf didn't merge in the boo-boo reversal. + +This search shouldn't really make sense from 4.4 onwards as the created_date field is in the contact record from 4.3, +meaning that this search would no longer add much value. + +JIRA: CRM-13887 +JIRA: CRM-17124 + --- civicrm-4.2.19/CRM/Contact/Form/Search/Custom/DateAdded.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Form/Search/Custom/DateAdded.php 2015-03-11 13:31:10.234248478 -0700 @@ -121,7 +121,6 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch b/patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch index 47bf428..92e1717 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-debug-queries.patch @@ -1,4 +1,11 @@ diff -urN civicrm-4.2.19/packages/DB/common.php civicrm-4.2.19-wmf/packages/DB/common.php + +Status: needs more review +Background: This patch appears to be about tracking queries for performance monitoring? +How does this compare with setting queries to DEBUG_LOG_QUERY? +Issues: CRM-17144 + CRM-17156 + --- civicrm-4.2.19/packages/DB/common.php 2014-09-09 15:40:26.000000000 -0700 +++ civicrm-4.2.19-wmf/packages/DB/common.php 2015-03-11 13:31:10.510248471 -0700 @@ -1148,6 +1148,22 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch b/patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch index bacf54e..b879bef 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-debug-upgrade.patch @@ -1,4 +1,15 @@ diff -urN civicrm-4.2.19/CRM/Upgrade/Form.php civicrm-4.2.19-wmf/CRM/Upgrade/Form.php + +Status: Agreed Ditch the debug , upstream money rule (CRM-17157). + +Recommendation: This adds some debug during upgrade. We could also get this by turning on query logging while upgrading +or reviewing the upgrade script so not sure it's worth carrying as a patch. + +ISSUE: CRM-17157 +There is also a fix to "Correct money rule to accept any decent decimal We should not reject harmless anomalies such as sub-penny shavings. " + +Not sure the reasoning for this - if there is a good case then we could upstream it. + --- civicrm-4.2.19/CRM/Upgrade/Form.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Upgrade/Form.php 2015-03-11 13:31:10.414248473 -0700 @@ -205,6 +205,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-dedupe.patch b/patches/civicrm-4.2.19-drupal-wmf-dedupe.patch index 58886c5..c665db2 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-dedupe.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-dedupe.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/CRM/Contact/Page/DedupeFind.php civicrm-4.2.19-wmf/CRM/Contact/Page/DedupeFind.php + +Status: Possible extension w form hook? +Background: This basically blocks deduping except from 2 contacts for performance reasons. + --- civicrm-4.2.19/CRM/Contact/Page/DedupeFind.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Page/DedupeFind.php 2015-03-11 13:31:10.246248478 -0700 @@ -167,6 +167,12 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-delete.patch b/patches/civicrm-4.2.19-drupal-wmf-delete.patch index 4370db8..01dc1f5 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-delete.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-delete.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/ACL/BAO/Cache.php civicrm-4.2.19-wmf/CRM/ACL/BAO/Cache.php + +Status: Needs investigation +Background: Patch changes various places from TRUNCATE to DELETE FROM +JIRA: CRM-10700 + --- civicrm-4.2.19/CRM/ACL/BAO/Cache.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/ACL/BAO/Cache.php 2015-03-11 13:31:10.174248480 -0700 @@ -149,7 +149,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-empty-search.patch b/patches/civicrm-4.2.19-drupal-wmf-empty-search.patch index 55c8928..52bd857 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-empty-search.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-empty-search.patch @@ -1,4 +1,10 @@ diff -urN civicrm-4.2.19/CRM/Contribute/Form/Search.php civicrm-4.2.19-wmf/CRM/Contribute/Form/Search.php + +Status: needs upstreaming +Background: patch prevents form from forcing a search when there is no qfKey in the url as it hammers the DB. +I can't see any evidence of it being upstream yet. +Issue: CRM-17158 + --- civicrm-4.2.19/CRM/Contribute/Form/Search.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contribute/Form/Search.php 2015-03-11 13:31:10.262248477 -0700 @@ -159,6 +159,13 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-entitytag.patch b/patches/civicrm-4.2.19-drupal-wmf-entitytag.patch index f5ac2ef..878a5ac 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-entitytag.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-entitytag.patch @@ -1,4 +1,11 @@ diff -urN civicrm-4.2.19/CRM/Core/BAO/EntityTag.php civicrm-4.2.19-wmf/CRM/Core/BAO/EntityTag.php + +Status: needs review +Background: adds new api civicrm_api('entity_tag', 'getdetails'). I suspect there is a more api-way of doing this. But, +it could go in an extension too. +Apparently used in +./donor_review/Crm.php + --- civicrm-4.2.19/CRM/Core/BAO/EntityTag.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/BAO/EntityTag.php 2015-03-11 13:31:10.274248477 -0700 @@ -64,6 +64,42 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-exception.patch b/patches/civicrm-4.2.19-drupal-wmf-exception.patch index b850873..05a63d9 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-exception.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-exception.patch @@ -1,4 +1,14 @@ diff -urN civicrm-4.2.19/CRM/Core/Error.php civicrm-4.2.19-wmf/CRM/Core/Error.php + +Status: Needs more review +Background: note that calling civicrm_api3 rather than civicrm_api causes exceptions to be thrown. +Commit comments: (FR #1066) Overly specific hack to bubble up DB_Error details +(FR #1238) Always throw an exception, do not display the fatal error page +Handle recursive data during exception handling print_r is causing out-of-memory under PHP 5.4.4 when debug dumping data with recursive content, +so fall back to existing var_dump print variant, which can handle the recursion. Both code paths partially emulate var_export, sigh. + +Issue: CRM-14674 + --- civicrm-4.2.19/CRM/Core/Error.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/Error.php 2015-03-11 13:31:10.294248476 -0700 @@ -77,7 +77,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-export.patch b/patches/civicrm-4.2.19-drupal-wmf-export.patch index 29da4dc..35124f8 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-export.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-export.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/Core/BAO/Mapping.php civicrm-4.2.19-wmf/CRM/Core/BAO/Mapping.php + +Status: needs more information +Background: changes to the mapping class from 4.1. Appears to be to support a custom search (need to find the search). +JIRA: CRM-10675 + --- civicrm-4.2.19/CRM/Core/BAO/Mapping.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/BAO/Mapping.php 2015-03-11 13:31:10.278248477 -0700 @@ -272,13 +272,12 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch b/patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch index 610c0fd..c41e572 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-expose-sql.patch @@ -1,4 +1,14 @@ diff -urN civicrm-4.2.19/CRM/Report/Form/Contribute/Lybunt.php civicrm-4.2.19-wmf/CRM/Report/Form/Contribute/Lybunt.php + +Status: Perhaps move the approach from extended report into core? +Background: Possibly part of the Giant Rabbit reports? This appears to be part of some method of monitoring sql queries? +In 4.6 the report UI has changed a bit & I added a developer tab to the extended reports which makes +it possible for someone with the permission to see the sql - would putting that in core work? + +Commit Comment: Make compatible with raw SQL instrumentation + +Store the intermediate SQL query in our standard member variable, so it can be displayed in the GUI. + --- civicrm-4.2.19/CRM/Report/Form/Contribute/Lybunt.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Report/Form/Contribute/Lybunt.php 2015-03-11 13:31:10.394248474 -0700 @@ -37,6 +37,8 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-failure-info.patch b/patches/civicrm-4.2.19-drupal-wmf-failure-info.patch index 2ab04a6..38dd897 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-failure-info.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-failure-info.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/CRM/Contribute/BAO/ContributionRecur.php civicrm-4.2.19-wmf/CRM/Contribute/BAO/ContributionRecur.php + +Status: needs upstreaming +Background: patch appears to add failure_count & failure_retry_date to recurring contribution tab. + --- civicrm-4.2.19/CRM/Contribute/BAO/ContributionRecur.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contribute/BAO/ContributionRecur.php 2015-03-11 13:31:10.254248478 -0700 @@ -338,6 +338,8 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-greetings.patch b/patches/civicrm-4.2.19-drupal-wmf-greetings.patch index 74529ad..82d4712 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-greetings.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-greetings.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/Contact/BAO/Contact.php civicrm-4.2.19-wmf/CRM/Contact/BAO/Contact.php + +Status: needs more information. +Background: patch causes this line to be skipped on create NOT: self::processGreetings($contact); +The patch has been through a few iterations.... No explanation. + --- civicrm-4.2.19/CRM/Contact/BAO/Contact.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/BAO/Contact.php 2015-03-11 13:31:10.218248478 -0700 @@ -426,7 +428,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch b/patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch index 4105859..5114ce7 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-jcalendar.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/templates/CRM/common/jcalendar.tpl civicrm-4.2.19-wmf/templates/CRM/common/jcalendar.tpl + +Status: needs more diagnosis. +Background: This is a tweak to the calender widget. It could just be a merge-history thing as there were a bunch of changes but +only this is left. This code has been rapidly moving so whatever the cause is likely to have changed. + --- civicrm-4.2.19/templates/CRM/common/jcalendar.tpl 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/templates/CRM/common/jcalendar.tpl 2015-03-11 13:31:10.722248465 -0700 @@ -114,7 +114,10 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch b/patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch index 9328621..f3652ba 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-language-freeform.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/Admin/Form/Setting/Localization.php civicrm-4.2.19-wmf/CRM/Admin/Form/Setting/Localization.php + +Status: Needs upstreaming: +Background: This hasn't been agreed yet but CiviCRM assumes a default language whereas WMF thinks that should not be stored +JIRA: CRM-14232 + --- civicrm-4.2.19/CRM/Admin/Form/Setting/Localization.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Admin/Form/Setting/Localization.php 2015-03-11 13:31:10.194248479 -0700 @@ -97,6 +97,8 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-option-cache.patch b/patches/civicrm-4.2.19-drupal-wmf-option-cache.patch index a0a8c9e..d44503d 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-option-cache.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-option-cache.patch @@ -1,4 +1,10 @@ diff -urN civicrm-4.2.19/CRM/Core/OptionGroup.php civicrm-4.2.19-wmf/CRM/Core/OptionGroup.php + +Status: needs upstreaming in some form. +Background: This introduces caching on CRM_Core_OptionGroup::getLabel +It's likely the correct fix is to deprecate that function. +JIRA: CRM-17120 + --- civicrm-4.2.19/CRM/Core/OptionGroup.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/OptionGroup.php 2015-03-11 13:31:10.298248476 -0700 @@ -34,6 +34,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-prevnext.patch b/patches/civicrm-4.2.19-drupal-wmf-prevnext.patch index 4a43d7a..41dcec4 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-prevnext.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-prevnext.patch @@ -1,4 +1,14 @@ diff -urN civicrm-4.2.19/CRM/Contact/Selector.php civicrm-4.2.19-wmf/CRM/Contact/Selector.php + +Status: Fixes to this are in 4.4 and 4.6 but needs more review - the deleteItem changes don't seem to be in core. +Background: These are performance fixes relevant to the prev_next cache. In 4.4 this was tackled (funded by NYSS). +JIRA: CRM-12638, CRM-12341 +usages of civicrm_prevnext_cache Sort of brute force approach. These queries were really expensive, and for no reason. +I'd like to just match the damn key, but will conservatively only rewrite infix searches as prefix searches. + +Rewrite all "LIKE" queries on civicrm_prevnext_cache We can't afford to be this sloppy. +Anyway, wish us luck keeping this in sync with upstream changes. + --- civicrm-4.2.19/CRM/Contact/Selector.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Selector.php 2015-03-11 13:31:10.250248478 -0700 @@ -799,7 +799,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-queryopt.patch b/patches/civicrm-4.2.19-drupal-wmf-queryopt.patch index aaca500..ed9779f 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-queryopt.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-queryopt.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/Contribute/BAO/Contribution.php civicrm-4.2.19-wmf/CRM/Contribute/BAO/Contribution.php + +Status: Resolved 4.4 and 4.6 +Background: This is a performance fix since fixed in core +JIRA: CRM-13321 + --- civicrm-4.2.19/CRM/Contribute/BAO/Contribution.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contribute/BAO/Contribution.php 2015-03-11 13:31:10.254248478 -0700 @@ -1826,22 +1826,40 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-refund.patch b/patches/civicrm-4.2.19-drupal-wmf-refund.patch index dc61a7b..5193e7c 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-refund.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-refund.patch @@ -1,4 +1,9 @@ diff -urN civicrm-4.2.19/CRM/Contribute/Form/Contribution.php civicrm-4.2.19-wmf/CRM/Contribute/Form/Contribution.php + +Status: This should be upstreamed into core. +Background: This adds refunds to the UI. +JIRA: CRM-11503 + --- civicrm-4.2.19/CRM/Contribute/Form/Contribution.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contribute/Form/Contribution.php 2015-03-11 13:31:10.258248477 -0700 @@ -1044,7 +1044,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-sort-name.patch b/patches/civicrm-4.2.19-drupal-wmf-sort-name.patch index 6a40f07..06774be 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-sort-name.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-sort-name.patch @@ -1,4 +1,13 @@ diff -urN civicrm-4.2.19/CRM/Contact/Page/AJAX.php civicrm-4.2.19-wmf/CRM/Contact/Page/AJAX.php + +Status: Recommend drop & re-fix if required. Lots' of change since this. (wouldn't apply cleanly either) + Also, the hook may not be required anymore as changes are in the repo now (CRM-12032) and + the quicksearch box is much changed + +Background: Fix some contact autocomplete boxes CRM_Utils_Hook::contactListQuery was munging the query +so the aliases didn't come out as the programmer originally intended. +Bug: T90020 + --- civicrm-4.2.19/CRM/Contact/Page/AJAX.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Page/AJAX.php 2015-03-11 13:31:10.246248478 -0700 @@ -730,7 +730,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-strict.patch b/patches/civicrm-4.2.19-drupal-wmf-strict.patch index 9b7c7bb..76ad8d3 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-strict.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-strict.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/CRM/ACL/BAO/ACL.php civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php + +Status: Resolved for 4.4 and 4.6 +Background: This is already in core upstream. + --- civicrm-4.2.19/CRM/ACL/BAO/ACL.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/ACL/BAO/ACL.php 2015-03-11 13:31:10.174248480 -0700 @@ -502,7 +503,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-style.patch b/patches/civicrm-4.2.19-drupal-wmf-style.patch index 222fd0d..909fbae 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-style.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-style.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/css/civicrm.css civicrm-4.2.19-wmf/css/civicrm.css + +Recommendation: move into a theme, or, worst case an extension could add this css. +Background: Loads of css changes in later versions & this isn't the place to maintain css overrides. + --- civicrm-4.2.19/css/civicrm.css 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/css/civicrm.css 2015-03-11 13:31:10.482248472 -0700 @@ -85,7 +85,6 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-triggers.patch b/patches/civicrm-4.2.19-drupal-wmf-triggers.patch index 665c8c8..d9ef70a 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-triggers.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-triggers.patch @@ -1,4 +1,14 @@ diff -urN civicrm-4.2.19/CRM/Core/DAO.php civicrm-4.2.19-wmf/CRM/Core/DAO.php + +Status: needs confirmation +Recommendation: I think this can be ignored until such time as WMF enables logging. +Background: My take on this is that it is to reduce trigger rebuilding activity. This should not be a problem +if logging is not enabled, unless there was an extra bug in 4.2, this routine should not be triggered. + +JIRA: CRM-12315 +Commit comments: revert annoying TRIGGER logging from civi core. +The intention was to catch new and substantial usages of triggers, but this has not happened yet. So the logging is annoying. + --- civicrm-4.2.19/CRM/Core/DAO.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Core/DAO.php 2015-03-11 13:31:10.286248477 -0700 @@ -1475,7 +1475,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-typo.patch b/patches/civicrm-4.2.19-drupal-wmf-typo.patch index b9f5517..426dc04 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-typo.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-typo.patch @@ -1,4 +1,12 @@ diff -urN civicrm-4.2.19/CRM/Contact/Form/CustomData.php civicrm-4.2.19-wmf/CRM/Contact/Form/CustomData.php + +Status: need to ascertain if there is a technical reason for this. +Recommendation: allow it to die a natural death +Background: This patch changes groupID in the url to groupId. I think it may be aesthetic. +Tim wasn't terribly keen on altering a url without a technical reason & there are 5 other instances of groupID and +one of groupId. +Commit notes: Looking at the commit history it seems like it is possibly mostly to do with the porting history. + --- civicrm-4.2.19/CRM/Contact/Form/CustomData.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contact/Form/CustomData.php 2015-03-11 13:31:10.230248478 -0700 @@ -122,7 +122,7 @@ diff --git a/patches/civicrm-4.2.19-drupal-wmf-typo2.patch b/patches/civicrm-4.2.19-drupal-wmf-typo2.patch index 69d41d2..bd25bc5 100644 --- a/patches/civicrm-4.2.19-drupal-wmf-typo2.patch +++ b/patches/civicrm-4.2.19-drupal-wmf-typo2.patch @@ -1,4 +1,8 @@ diff -urN civicrm-4.2.19/CRM/Contribute/Form/Task.php civicrm-4.2.19-wmf/CRM/Contribute/Form/Task.php + +Status: Resolved for 4.4 and 4.6 +Background: This is already in core upstream. + --- civicrm-4.2.19/CRM/Contribute/Form/Task.php 2014-09-09 15:40:20.000000000 -0700 +++ civicrm-4.2.19-wmf/CRM/Contribute/Form/Task.php 2015-03-11 13:31:10.262248477 -0700 @@ -166,7 +166,7 @@ -- To view, visit https://gerrit.wikimedia.org/r/235359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If26d079a2adb63d1999982669914d76f139a71e2 Gerrit-PatchSet: 4 Gerrit-Project: wikimedia/fundraising/crm/civicrm Gerrit-Branch: master Gerrit-Owner: Eileen <[email protected]> Gerrit-Reviewer: Awight <[email protected]> Gerrit-Reviewer: Eileen <[email protected]> Gerrit-Reviewer: Ejegg <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
