Skip to content

Commit 16d83fb

Browse files
committed
Update to CiviCRM 5.5.3. This release includes a number of bug fixes and improvements, including database changes. Read more about the changes: https://civicrm.org/blog/dev-team/announcing-civicrm-55-release and https://civicrm.org/blog/dev-team/announcing-civicrm-54-release.
Make sure you backup using Pantheon's database backup tool first. Then either go to http://<your_drupal_home>/civicrm/upgrade?reset=1 or use terminus drush site.env civicrm-upgrade-db. Fully test on a dev environment before upgrading on live. Don't merge this code yet if you've got other updates which are urgent. If you have questions contact http://civicrmstarterkit.org/contact. We provide some basic general support for the public. If you require help with your specific website there will likely be a cost.
1 parent 9035027 commit 16d83fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+330
-173
lines changed

profiles/civicrm_starterkit/civicrm_starterkit.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ projects[drupal][version] = "7.51"
1313
; ====== CIVICRM RELATED =========
1414

1515
libraries[civicrm][download][type] = get
16-
libraries[civicrm][download][url] = "https://download.civicrm.org/civicrm-5.5.1-drupal.tar.gz"
16+
libraries[civicrm][download][url] = "https://download.civicrm.org/civicrm-5.5.3-drupal.tar.gz"
1717
libraries[civicrm][destination] = modules
1818
libraries[civicrm][directory_name] = civicrm
1919

profiles/civicrm_starterkit/modules/civicrm/CRM/Contact/BAO/Contact.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -2032,8 +2032,10 @@ public static function createProfileContact(
20322032
CRM_Contact_BAO_GroupContact::create($params['group'], $contactID, $visibility, $method);
20332033
}
20342034

2035-
if (!empty($fields['tag'])) {
2036-
CRM_Core_BAO_EntityTag::create($params['tag'], 'civicrm_contact', $contactID);
2035+
if (!empty($fields['tag']) && array_key_exists('tag', $params)) {
2036+
// Convert comma separated form values from select2 v3
2037+
$tags = is_array($params['tag']) ? $params['tag'] : array_fill_keys(array_filter(explode(',', $params['tag'])), 1);
2038+
CRM_Core_BAO_EntityTag::create($tags, 'civicrm_contact', $contactID);
20372039
}
20382040

20392041
//to add profile in default group

profiles/civicrm_starterkit/modules/civicrm/CRM/Upgrade/Incremental/php/FiveFive.php

+17
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,21 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
8484
// return TRUE;
8585
// }
8686

87+
/**
88+
* Upgrade function.
89+
*
90+
* @param string $rev
91+
*/
92+
public function upgrade_5_5_2($rev) {
93+
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
94+
$this->addTask('dev/core#107 - Add Activity\'s default assignee options', 'addActivityDefaultAssigneeOptions');
95+
}
96+
97+
public static function addActivityDefaultAssigneeOptions() {
98+
// This data was originally added via upgrader in 5.4.alpha1. However, it was omitted from the
99+
// default data for new installations. Re-running the upgrader should fix sites initialized
100+
// between 5.4.alpha1-5.5.1.
101+
return CRM_Upgrade_Incremental_php_FiveFour::addActivityDefaultAssigneeOptions();
102+
}
103+
87104
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{* file to handle db changes in 5.5.2 during upgrade *}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#fix typo when setting default in https://github.com/civicrm/civicrm-core/pull/12410
2+
ALTER TABLE civicrm_option_group MODIFY COLUMN is_locked TINYINT(4) NOT NULL DEFAULT 0 COMMENT 'A lock to remove the ability to add new options via the UI.';
3+
4+
UPDATE civicrm_option_group
5+
SET is_locked = 0
6+
WHERE name REGEXP '.*_2018[0-9]+$'
7+
AND id IN (SELECT DISTINCT option_group_id FROM civicrm_custom_field);

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/.bower.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jstree",
33
"license": "MIT",
4-
"version": "3.3.5",
4+
"version": "3.3.6",
55
"main": [
66
"./dist/jstree.js",
77
"./dist/themes/default/style.css"
@@ -31,11 +31,11 @@
3131
"jstree"
3232
],
3333
"homepage": "https://github.com/vakata/jstree",
34-
"_release": "3.3.5",
34+
"_release": "3.3.6",
3535
"_resolution": {
3636
"type": "version",
37-
"tag": "3.3.5",
38-
"commit": "0097fab41981daf36c234b73b683166daabd5f28"
37+
"tag": "3.3.6",
38+
"commit": "39d167dc3f931fa95e588d4d106d9b44cbcdb6f9"
3939
},
4040
"_source": "https://github.com/vakata/jstree.git",
4141
"_target": "~3",

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jstree",
33
"license": "MIT",
4-
"version": "3.3.5",
4+
"version": "3.3.6",
55
"main" : [
66
"./dist/jstree.js",
77
"./dist/themes/default/style.css"

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/jstree.js

+26-14
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
}(function ($, undefined) {
1414
"use strict";
1515
/*!
16-
* jsTree 3.3.5
16+
* jsTree 3.3.6
1717
* http://jstree.com/
1818
*
1919
* Copyright (c) 2014 Ivan Bozhanov (http://vakata.com)
@@ -54,7 +54,7 @@
5454
* specifies the jstree version in use
5555
* @name $.jstree.version
5656
*/
57-
version : '3.3.5',
57+
version : '3.3.6',
5858
/**
5959
* holds all the default options used when creating new instances
6060
* @name $.jstree.defaults
@@ -430,7 +430,7 @@
430430
*/
431431
force_text : false,
432432
/**
433-
* Should the node should be toggled if the text is double clicked . Defaults to `true`
433+
* Should the node be toggled if the text is double clicked. Defaults to `true`
434434
* @name $.jstree.defaults.core.dblclick_toggle
435435
*/
436436
dblclick_toggle : true,
@@ -1331,7 +1331,7 @@
13311331
return true;
13321332
},
13331333
/**
1334-
* load an array of nodes (will also load unavailable nodes as soon as the appear in the structure). Used internally.
1334+
* load an array of nodes (will also load unavailable nodes as soon as they appear in the structure). Used internally.
13351335
* @private
13361336
* @name _load_nodes(nodes [, callback])
13371337
* @param {array} nodes
@@ -2608,7 +2608,7 @@
26082608
return node;
26092609
},
26102610
/**
2611-
* opens a node, revaling its children. If the node is not loaded it will be loaded and opened once ready.
2611+
* opens a node, revealing its children. If the node is not loaded it will be loaded and opened once ready.
26122612
* @name open_node(obj [, callback, animation])
26132613
* @param {mixed} obj the node to open
26142614
* @param {Function} callback a function to execute once the node is opened
@@ -2812,7 +2812,7 @@
28122812
}
28132813
},
28142814
/**
2815-
* opens all nodes within a node (or the tree), revaling their children. If the node is not loaded it will be loaded and opened once ready.
2815+
* opens all nodes within a node (or the tree), revealing their children. If the node is not loaded it will be loaded and opened once ready.
28162816
* @name open_all([obj, animation, original_obj])
28172817
* @param {mixed} obj the node to open recursively, omit to open all nodes in the tree
28182818
* @param {Number} animation the animation duration in milliseconds when opening the nodes, the default is no animation
@@ -2853,7 +2853,7 @@
28532853
}
28542854
},
28552855
/**
2856-
* closes all nodes within a node (or the tree), revaling their children
2856+
* closes all nodes within a node (or the tree), revealing their children
28572857
* @name close_all([obj, animation])
28582858
* @param {mixed} obj the node to close recursively, omit to close all nodes in the tree
28592859
* @param {Number} animation the animation duration in milliseconds when closing the nodes, the default is no animation
@@ -4491,7 +4491,7 @@
44914491
w2 = ai.width() * ai.length,
44924492
*/
44934493
t = default_text;
4494-
h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body");
4494+
h1 = $("<"+"div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo(document.body);
44954495
h2 = $("<"+"input />", {
44964496
"value" : t,
44974497
"class" : "jstree-rename-input",
@@ -5922,7 +5922,7 @@
59225922
return res;
59235923
};
59245924
this.refresh = function (skip_loading, forget_state) {
5925-
if(!this.settings.checkbox.tie_selection) {
5925+
if(this.settings.checkbox.tie_selection) {
59265926
this._data.checkbox.selected = [];
59275927
}
59285928
return parent.refresh.apply(this, arguments);
@@ -6424,7 +6424,7 @@
64246424
vakata_context.element.html(vakata_context.html);
64256425
}
64266426
if(vakata_context.items.length) {
6427-
vakata_context.element.appendTo("body");
6427+
vakata_context.element.appendTo(document.body);
64286428
e = vakata_context.element;
64296429
x = vakata_context.position_x;
64306430
y = vakata_context.position_y;
@@ -6480,7 +6480,7 @@
64806480
}
64816481
};
64826482
$(function () {
6483-
right_to_left = $("body").css("direction") === "rtl";
6483+
right_to_left = $(document.body).css("direction") === "rtl";
64846484
var to = false;
64856485

64866486
vakata_context.element = $("<ul class='vakata-context'></ul>");
@@ -6768,11 +6768,23 @@
67686768
marker = $('<div id="jstree-marker">&#160;</div>').hide(); //.appendTo('body');
67696769

67706770
$(document)
6771+
.on('dragover.vakata.jstree', function (e) {
6772+
if (elm) {
6773+
$.vakata.dnd._trigger('move', e, { 'helper': $(), 'element': elm, 'data': drg });
6774+
}
6775+
})
6776+
.on('drop.vakata.jstree', function (e) {
6777+
if (elm) {
6778+
$.vakata.dnd._trigger('stop', e, { 'helper': $(), 'element': elm, 'data': drg });
6779+
elm = null;
6780+
drg = null;
6781+
}
6782+
})
67716783
.on('dnd_start.vakata.jstree', function (e, data) {
67726784
lastmv = false;
67736785
lastev = false;
67746786
if(!data || !data.data || !data.data.jstree) { return; }
6775-
marker.appendTo('body'); //.show();
6787+
marker.appendTo(document.body); //.show();
67766788
})
67776789
.on('dnd_move.vakata.jstree', function (e, data) {
67786790
var isDifferentNode = data.event.target !== lastev.target;
@@ -6906,7 +6918,7 @@
69066918
lastmv = false;
69076919
data.helper.find('.jstree-icon').removeClass('jstree-ok').addClass('jstree-er');
69086920
if (data.event.originalEvent && data.event.originalEvent.dataTransfer) {
6909-
data.event.originalEvent.dataTransfer.dropEffect = 'none';
6921+
//data.event.originalEvent.dataTransfer.dropEffect = 'none';
69106922
}
69116923
marker.hide();
69126924
})
@@ -7117,7 +7129,7 @@
71177129
Math.abs(e.pageY - vakata_dnd.init_y) > (vakata_dnd.is_touch ? $.vakata.dnd.settings.threshold_touch : $.vakata.dnd.settings.threshold)
71187130
) {
71197131
if(vakata_dnd.helper) {
7120-
vakata_dnd.helper.appendTo("body");
7132+
vakata_dnd.helper.appendTo(document.body);
71217133
vakata_dnd.helper_w = vakata_dnd.helper.outerWidth();
71227134
}
71237135
vakata_dnd.is_drag = true;

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/jstree.min.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/themes/default-dark/style.css

+12-21
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,14 @@
297297
transition: background-color 0.15s, box-shadow 0.15s;
298298
}
299299
.jstree-default-dark .jstree-hovered {
300-
background: #555555;
300+
background: #555;
301301
border-radius: 2px;
302-
box-shadow: inset 0 0 1px #555555;
302+
box-shadow: inset 0 0 1px #555;
303303
}
304304
.jstree-default-dark .jstree-context {
305-
background: #555555;
305+
background: #555;
306306
border-radius: 2px;
307-
box-shadow: inset 0 0 1px #555555;
307+
box-shadow: inset 0 0 1px #555;
308308
}
309309
.jstree-default-dark .jstree-clicked {
310310
background: #5fa2db;
@@ -347,13 +347,13 @@
347347
box-shadow: none;
348348
}
349349
.jstree-default-dark.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered {
350-
background: #555555;
350+
background: #555;
351351
}
352352
.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked {
353353
background: transparent;
354354
}
355355
.jstree-default-dark.jstree-checkbox-no-clicked > .jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered {
356-
background: #555555;
356+
background: #555;
357357
}
358358
.jstree-default-dark > .jstree-striped {
359359
min-width: 100%;
@@ -372,7 +372,7 @@
372372
box-sizing: border-box;
373373
}
374374
.jstree-default-dark .jstree-wholerow-hovered {
375-
background: #555555;
375+
background: #555;
376376
}
377377
.jstree-default-dark .jstree-wholerow-clicked {
378378
background: #5fa2db;
@@ -554,9 +554,6 @@
554554
text-overflow: ellipsis;
555555
overflow: hidden;
556556
}
557-
.jstree-default-dark .jstree-ellipsis.jstree-no-icons .jstree-anchor {
558-
width: calc(100% - 5px);
559-
}
560557
.jstree-default-dark.jstree-rtl .jstree-node {
561558
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
562559
}
@@ -738,9 +735,6 @@
738735
text-overflow: ellipsis;
739736
overflow: hidden;
740737
}
741-
.jstree-default-dark-small .jstree-ellipsis.jstree-no-icons .jstree-anchor {
742-
width: calc(100% - 5px);
743-
}
744738
.jstree-default-dark-small.jstree-rtl .jstree-node {
745739
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
746740
}
@@ -922,9 +916,6 @@
922916
text-overflow: ellipsis;
923917
overflow: hidden;
924918
}
925-
.jstree-default-dark-large .jstree-ellipsis.jstree-no-icons .jstree-anchor {
926-
width: calc(100% - 5px);
927-
}
928919
.jstree-default-dark-large.jstree-rtl .jstree-node {
929920
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
930921
}
@@ -1012,13 +1003,13 @@
10121003
background: transparent;
10131004
}
10141005
.jstree-default-dark-responsive .jstree-open > .jstree-ocl {
1015-
background-position: 0 0px !important;
1006+
background-position: 0 0 !important;
10161007
}
10171008
.jstree-default-dark-responsive .jstree-closed > .jstree-ocl {
10181009
background-position: 0 -40px !important;
10191010
}
10201011
.jstree-default-dark-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
1021-
background-position: -40px 0px !important;
1012+
background-position: -40px 0 !important;
10221013
}
10231014
.jstree-default-dark-responsive .jstree-themeicon {
10241015
background-position: -40px -40px;
@@ -1046,13 +1037,13 @@
10461037
background: transparent;
10471038
}
10481039
.jstree-default-dark-responsive .jstree-wholerow {
1049-
border-top: 1px solid #666666;
1050-
border-bottom: 1px solid #000000;
1040+
border-top: 1px solid #666;
1041+
border-bottom: 1px solid #000;
10511042
background: #333333;
10521043
height: 40px;
10531044
}
10541045
.jstree-default-dark-responsive .jstree-wholerow-hovered {
1055-
background: #555555;
1046+
background: #555;
10561047
}
10571048
.jstree-default-dark-responsive .jstree-wholerow-clicked {
10581049
background: #5fa2db;

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/themes/default-dark/style.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Loading

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/themes/default/style.css

+2-11
Original file line numberDiff line numberDiff line change
@@ -554,9 +554,6 @@
554554
text-overflow: ellipsis;
555555
overflow: hidden;
556556
}
557-
.jstree-default .jstree-ellipsis.jstree-no-icons .jstree-anchor {
558-
width: calc(100% - 5px);
559-
}
560557
.jstree-default.jstree-rtl .jstree-node {
561558
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
562559
}
@@ -738,9 +735,6 @@
738735
text-overflow: ellipsis;
739736
overflow: hidden;
740737
}
741-
.jstree-default-small .jstree-ellipsis.jstree-no-icons .jstree-anchor {
742-
width: calc(100% - 5px);
743-
}
744738
.jstree-default-small.jstree-rtl .jstree-node {
745739
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==");
746740
}
@@ -922,9 +916,6 @@
922916
text-overflow: ellipsis;
923917
overflow: hidden;
924918
}
925-
.jstree-default-large .jstree-ellipsis.jstree-no-icons .jstree-anchor {
926-
width: calc(100% - 5px);
927-
}
928919
.jstree-default-large.jstree-rtl .jstree-node {
929920
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==");
930921
}
@@ -1012,13 +1003,13 @@
10121003
background: transparent;
10131004
}
10141005
.jstree-default-responsive .jstree-open > .jstree-ocl {
1015-
background-position: 0 0px !important;
1006+
background-position: 0 0 !important;
10161007
}
10171008
.jstree-default-responsive .jstree-closed > .jstree-ocl {
10181009
background-position: 0 -40px !important;
10191010
}
10201011
.jstree-default-responsive.jstree-rtl .jstree-closed > .jstree-ocl {
1021-
background-position: -40px 0px !important;
1012+
background-position: -40px 0 !important;
10221013
}
10231014
.jstree-default-responsive .jstree-themeicon {
10241015
background-position: -40px -40px;

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/dist/themes/default/style.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

profiles/civicrm_starterkit/modules/civicrm/bower_components/jstree/src/jstree.checkbox.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@
964964
return res;
965965
};
966966
this.refresh = function (skip_loading, forget_state) {
967-
if(!this.settings.checkbox.tie_selection) {
967+
if(this.settings.checkbox.tie_selection) {
968968
this._data.checkbox.selected = [];
969969
}
970970
return parent.refresh.apply(this, arguments);

0 commit comments

Comments
 (0)