diff --git a/civicrm.php b/civicrm.php
index 166d2cb6a0dba4e36ceae327b8b9b3e352aa5235..90994bf520a1ac38ba87e096fb946f7b629ec80b 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.12.1
+Version: 5.12.3
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
diff --git a/civicrm/CRM/ACL/Form/WordPress/Permissions.php b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
index bff39194d09c1e2493c1e50f93e36f91c0ab87bf..24e63eaa6082e4bbea5fd06fee9279f99b7c8560 100644
--- a/civicrm/CRM/ACL/Form/WordPress/Permissions.php
+++ b/civicrm/CRM/ACL/Form/WordPress/Permissions.php
@@ -54,7 +54,7 @@ class CRM_ACL_Form_WordPress_Permissions extends CRM_Core_Form {
}
foreach ($wp_roles->role_names as $role => $name) {
// Don't show the permissions options for administrator, as they have all permissions
- if ( is_multisite() OR $role !== 'administrator') {
+ if ($role !== 'administrator') {
$roleObj = $wp_roles->get_role($role);
if (!empty($roleObj->capabilities)) {
foreach ($roleObj->capabilities as $ckey => $cname) {
diff --git a/civicrm/CRM/Contact/Page/View/UserDashBoard.php b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
index b9863de1986169d15680481fe9e32571f40cc102..445a9571ccae68cf76f3332871e9fec1b10347b7 100644
--- a/civicrm/CRM/Contact/Page/View/UserDashBoard.php
+++ b/civicrm/CRM/Contact/Page/View/UserDashBoard.php
@@ -180,9 +180,6 @@ class CRM_Contact_Page_View_UserDashBoard extends CRM_Core_Page {
usort($dashboardElements, array('CRM_Utils_Sort', 'cmpFunc'));
$this->assign('dashboardElements', $dashboardElements);
- // return true when 'Invoices / Credit Notes' checkbox is checked
- $this->assign('invoices', $dashboardOptions['Invoices / Credit Notes']);
-
if (!empty($dashboardOptions['Groups'])) {
$this->assign('showGroup', TRUE);
//build group selector
diff --git a/civicrm/CRM/Contribute/Form/Task/Invoice.php b/civicrm/CRM/Contribute/Form/Task/Invoice.php
index d6e4758d4b7efea07f5f9f3650e31ce783d1e426..865f91b5a1ef7e513daac8a74cd2c69b6fb737c4 100644
--- a/civicrm/CRM/Contribute/Form/Task/Invoice.php
+++ b/civicrm/CRM/Contribute/Form/Task/Invoice.php
@@ -298,7 +298,13 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
$invoiceDate = date("F j, Y");
$dueDate = date('F j, Y', strtotime($contributionReceiveDate . "+" . $prefixValue['due_date'] . "" . $prefixValue['due_date_period']));
- $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ if ($input['component'] == 'contribute') {
+ $lineItem = CRM_Price_BAO_LineItem::getLineItemsByContributionID($contribID);
+ }
+ else {
+ $eid = $contribution->_relatedObjects['participant']->id;
+ $lineItem = CRM_Price_BAO_LineItem::getLineItems($eid, 'participant', NULL, TRUE, FALSE, TRUE);
+ }
$resultPayments = civicrm_api3('Payment', 'get', array(
'sequential' => 1,
diff --git a/civicrm/CRM/Contribute/Page/UserDashboard.php b/civicrm/CRM/Contribute/Page/UserDashboard.php
index 1efad9f3862c60f0cdd2ae268579b797630b33ef..10a2ce4ad8ef6d193ffa8668a561d4d6737fd5c7 100644
--- a/civicrm/CRM/Contribute/Page/UserDashboard.php
+++ b/civicrm/CRM/Contribute/Page/UserDashboard.php
@@ -60,11 +60,23 @@ class CRM_Contribute_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBo
// We want oldest first, just among the most recent contributions
$rows = array_reverse($rows);
- foreach ($rows as $index => $row) {
+ foreach ($rows as $index => &$row) {
// This is required for tpl logic. We should move away from hard-code this to adding an array of actions to the row
// which the tpl can iterate through - this should allow us to cope with competing attempts to add new buttons
// and allow extensions to assign new ones through the pageRun hook
- $row[0]['contribution_status_name'] = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id']);;
+ if ('Pending' === CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $row['contribution_status_id'])) {
+ $row['buttons']['pay'] = [
+ 'class' => 'button',
+ 'label' => ts('Pay Now'),
+ 'url' => CRM_Utils_System::url('civicrm/contribute/transact', [
+ 'reset' => 1,
+ 'id' => CRM_Invoicing_Utils::getDefaultPaymentPage(),
+ 'ccid' => $row['contribution_id'],
+ 'cs' => $this->getUserChecksum(),
+ 'cid' => $row['contact_id'],
+ ])
+ ];
+ }
}
$this->assign('contribute_rows', $rows);
@@ -145,13 +157,28 @@ class CRM_Contribute_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBo
}
}
+ /**
+ * Should invoice links be displayed on the template.
+ *
+ * @todo This should be moved to a hook-like structure on the invoicing class
+ * (currently CRM_Utils_Invoicing) with a view to possible removal from core.
+ */
+ public function isIncludeInvoiceLinks() {
+ if (!CRM_Invoicing_Utils::isInvoicingEnabled()) {
+ return FALSE;
+ }
+ $dashboardOptions = CRM_Core_BAO_Setting::valueOptions(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
+ 'user_dashboard_options'
+ );
+ return $dashboardOptions['Invoices / Credit Notes'];
+ }
+
/**
* the main function that is called when the page
* loads, it decides the which action has to be taken for the page.
*/
public function run() {
- $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled());
- $this->assign('defaultInvoicePage', CRM_Invoicing_Utils::getDefaultPaymentPage());
+ $this->assign('isIncludeInvoiceLinks', $this->isIncludeInvoiceLinks());
parent::preProcess();
$this->listContribution();
}
diff --git a/civicrm/CRM/Core/Form/Search.php b/civicrm/CRM/Core/Form/Search.php
index c0defa2ac521b7bfea9cc32c5bb7d8a460f4716c..37997f694934cb6eb224e4a43369815f5e6b1513 100644
--- a/civicrm/CRM/Core/Form/Search.php
+++ b/civicrm/CRM/Core/Form/Search.php
@@ -176,6 +176,11 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
*/
public static function formRule($fields, $files, $form) {
$errors = [];
+ if (!is_a($form, 'CRM_Core_Form_Search')) {
+ // So this gets hit with a form object when doing an activity date search from
+ // advanced search, but a NULL object when doing a pledge search.
+ return $errors;
+ }
foreach ($form->getSearchFieldMetadata() as $entity => $spec) {
foreach ($spec as $fieldName => $fieldSpec) {
if ($fieldSpec['type'] === CRM_Utils_Type::T_DATE || $fieldSpec['type'] === (CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME)) {
diff --git a/civicrm/CRM/Grant/BAO/Query.php b/civicrm/CRM/Grant/BAO/Query.php
index 8825dc72e5b36270d90932ee884c2d6bde6a07a3..62a227145d8e7ccb2f2bf22efc8d7fe49551e74f 100644
--- a/civicrm/CRM/Grant/BAO/Query.php
+++ b/civicrm/CRM/Grant/BAO/Query.php
@@ -296,7 +296,7 @@ class CRM_Grant_BAO_Query extends CRM_Core_BAO_Query {
}
/**
- * Get the metadata for fields to be included on the activity search form.
+ * Get the metadata for fields to be included on the grant search form.
*/
public static function getSearchFieldMetadata() {
$fields = [
diff --git a/civicrm/CRM/Mailing/BAO/Mailing.php b/civicrm/CRM/Mailing/BAO/Mailing.php
index 927fdeec4413a4fba449c18f056c64fcb03ca31e..a109c35f6dc115b9f1feb980ec15c368951d7cbc 100644
--- a/civicrm/CRM/Mailing/BAO/Mailing.php
+++ b/civicrm/CRM/Mailing/BAO/Mailing.php
@@ -1366,7 +1366,7 @@ ORDER BY civicrm_email.is_bulkmail DESC
}
}
elseif ($type == 'url') {
- if ($this->url_tracking) {
+ if ($this->url_tracking && !empty($this->id)) {
$data = CRM_Mailing_BAO_TrackableURL::getTrackerURL($token, $this->id, $event_queue_id);
if (!empty($html)) {
$data = htmlentities($data, ENT_NOQUOTES);
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.12.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.12.2.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..121d4950006412c7a6cf6bfcbac9d2bd0bbff12a
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.12.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.12.2 during upgrade *}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.12.3.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.12.3.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..8639463303d9ecab9ceacf7e73532aff1acd86e8
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.12.3.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.12.3 during upgrade *}
diff --git a/civicrm/CRM/Utils/System/WordPress.php b/civicrm/CRM/Utils/System/WordPress.php
index 27fffe2af7ee795bb34e4f22de8f71505a90201c..f450056bdbd65a3671a8863d50d0b437b717df00 100644
--- a/civicrm/CRM/Utils/System/WordPress.php
+++ b/civicrm/CRM/Utils/System/WordPress.php
@@ -810,13 +810,11 @@ class CRM_Utils_System_WordPress extends CRM_Utils_System_Base {
$contactCreated = 0;
$contactMatching = 0;
- // previously used $wpdb - which means WordPress *must* be bootstrapped
- $wpUsers = get_users(array(
- 'blog_id' => get_current_blog_id(),
- 'number' => -1,
- ));
+ global $wpdb;
+ $wpUserIds = $wpdb->get_col("SELECT $wpdb->users.ID FROM $wpdb->users");
- foreach ($wpUsers as $wpUserData) {
+ foreach ($wpUserIds as $wpUserId) {
+ $wpUserData = get_userdata($wpUserId);
$contactCount++;
if ($match = CRM_Core_BAO_UFMatch::synchronizeUFMatch($wpUserData,
$wpUserData->$id,
diff --git a/civicrm/bower_components/jquery-ui/.bower.json b/civicrm/bower_components/jquery-ui/.bower.json
index a37977e293dab1139234c1e11ff472e0011d1161..d28097dd886aa3254e1ae3f4b4c31a9a08723e8e 100644
--- a/civicrm/bower_components/jquery-ui/.bower.json
+++ b/civicrm/bower_components/jquery-ui/.bower.json
@@ -17,6 +17,6 @@
"commit": "44ecf3794cc56b65954cc19737234a3119d036cc"
},
"_source": "https://github.com/components/jqueryui.git",
- "_target": ">=1.9",
+ "_target": "~1.12",
"_originalSource": "jquery-ui"
}
\ No newline at end of file
diff --git a/civicrm/civicrm-version.php b/civicrm/civicrm-version.php
index 882885d4fc8e13828c19f7185c95ead4e2595e2f..13aa8e3f74e3494b6d5e979e02dfe74532ba11a2 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,7 +1,7 @@
<?php
/** @deprecated */
function civicrmVersion( ) {
- return array( 'version' => '5.12.1',
+ return array( 'version' => '5.12.3',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/css/crm-menubar.css b/civicrm/css/crm-menubar.css
index aa53639ccc1e17d94351141a9f8a34e4deb1b28a..89b486963e872b54b53d406649d14ae1d1dad6ea 100644
--- a/civicrm/css/crm-menubar.css
+++ b/civicrm/css/crm-menubar.css
@@ -134,6 +134,7 @@ input#crm-qsearch-input {
height: 30px;
width: 30px;
transition: width .5s .05s, background-color .3s .05s;
+ color: black;
}
a.highlighted #crm-qsearch-input,
#crm-qsearch-input:focus,
@@ -240,6 +241,10 @@ body.crm-menubar-over-cms-menu #crm-menubar-toggle-position a i {
z-index: 99999;
}
+ body.crm-menubar-above-crm-container #civicrm-menu {
+ z-index: 100;
+ }
+
body.crm-menubar-hidden #civicrm-menu {
display: none;
}
diff --git a/civicrm/js/Common.js b/civicrm/js/Common.js
index d53f2c1a54bba8e33fc55fb236e20c546e87c48b..6ddefe2940d35a91d165cb9e2bcd8f32d290beff 100644
--- a/civicrm/js/Common.js
+++ b/civicrm/js/Common.js
@@ -923,6 +923,7 @@ if (!CRM.vars) CRM.vars = {};
})
.on('dialogopen', function(e) {
var $el = $(e.target);
+ $('body').addClass('ui-dialog-open');
// Modal dialogs should disable scrollbars
if ($el.dialog('option', 'modal')) {
$el.addClass('modal-dialog');
@@ -939,6 +940,9 @@ if (!CRM.vars) CRM.vars = {};
$(this).button('option', 'icons', {primary: 'fa-expand'});
} else {
var menuHeight = $('#civicrm-menu').outerHeight();
+ if ($('body').hasClass('crm-menubar-below-cms-menu')) {
+ menuHeight += $('#civicrm-menu').offset().top;
+ }
$el.data('origSize', {
position: {my: 'center', at: 'center center+' + (menuHeight / 2), of: window},
width: $el.dialog('option', 'width'),
@@ -957,6 +961,9 @@ if (!CRM.vars) CRM.vars = {};
if ($('.ui-dialog .modal-dialog:visible').not(e.target).length < 1) {
$('body').css({overflow: ''});
}
+ if ($('.ui-dialog-content:visible').not(e.target).length < 1) {
+ $('body').removeClass('ui-dialog-open');
+ }
})
.on('submit', function(e) {
// CRM-14353 - disable changes warn when submitting a form
diff --git a/civicrm/js/crm.ajax.js b/civicrm/js/crm.ajax.js
index 5a1155c8462bd2a24a1e90d91eefc77628be87db..23be078e8b5af74a548cd9f2f87501d07fdeacaf 100644
--- a/civicrm/js/crm.ajax.js
+++ b/civicrm/js/crm.ajax.js
@@ -572,8 +572,11 @@
var currentHeight = $wrapper.outerHeight(),
padding = currentHeight - $dialog.height(),
newHeight = $dialog.prop('scrollHeight') + padding,
- menuHeight = $('#civicrm-menu').outerHeight(),
- maxHeight = $(window).height() - menuHeight;
+ menuHeight = $('#civicrm-menu').outerHeight();
+ if ($('body').hasClass('crm-menubar-below-cms-menu')) {
+ menuHeight += $('#civicrm-menu').offset().top;
+ }
+ var maxHeight = $(window).height() - menuHeight;
newHeight = newHeight > maxHeight ? maxHeight : newHeight;
if (newHeight > (currentHeight + 15)) {
$dialog.dialog('option', {
diff --git a/civicrm/release-notes/5.12.1.md b/civicrm/release-notes/5.12.1.md
index 87e6545908f7c9a0ce2ae956edcd0996b8a4662f..bf3c145801c7b588cf559ae86fc4d3369d567f99 100644
--- a/civicrm/release-notes/5.12.1.md
+++ b/civicrm/release-notes/5.12.1.md
@@ -32,7 +32,7 @@ Released April 15, 2019
This release was developed by the following authors and reviewers:
AGH Strategies - Andrew Hunt; Australian Greens - Seamus Lee; CiviCRM -
-Coleman Watts, Tim Otten; Dave Dantowtiz; Korlon - Stuart Gaston; Wikimedia
+Coleman Watts, Tim Otten; Dave D; Korlon - Stuart Gaston; Wikimedia
Foundation - Eileen McNaughton
## <a name="feedback"></a>Feedback
diff --git a/civicrm/release-notes/5.12.2.md b/civicrm/release-notes/5.12.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..4593f65482becba04be71a5e090bc23db30e84e0
--- /dev/null
+++ b/civicrm/release-notes/5.12.2.md
@@ -0,0 +1,43 @@
+# CiviCRM 5.12.2
+
+Released April 19, 2019
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+- **Menu - Fix a visual issue where the menu obscures modal dialogs ([14066](https://github.com/civicrm/civicrm-core/pull/14066))**
+- **CiviMail - Fix an error in "Preview as HTML" ([dev/mail#41](https://lab.civicrm.org/dev/mail/issues/41): [14081](https://github.com/civicrm/civicrm-core/pull/14081))**
+- **Contact Dashboard - Restore missing buttons ("Pay Now", "Print Invoice") ([dev/core#534](https://lab.civicrm.org/dev/core/issues/534): [14051](https://github.com/civicrm/civicrm-core/pull/14051))**
+- **Drupal 8 - Restore coloring ([dev/drupal#56](https://lab.civicrm.org/dev/drupal/issues/56): [8b7b2f58](https://github.com/civicrm/civicrm-core/commit/8b7b2f58fb441a2ea4780ba5dafc32903282e7aa))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin
+Cristiano; Richard van Oosterhout; Megaphone Technology Consulting - Jon
+Goldberg; Lighthouse Design and Consulting - Brian Shaughnessy; JMA
+Consulting - Monish Deb; CiviFirst - John Kirk; CiviCRM - Tim Otten, Coleman
+Watts; Caltha - Tomasz Pietrzkowski; Australian Greens - Seamus Lee
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/release-notes/5.12.3.md b/civicrm/release-notes/5.12.3.md
new file mode 100644
index 0000000000000000000000000000000000000000..f0ba19ccbda22286f59be937ebf5b79858b51fc1
--- /dev/null
+++ b/civicrm/release-notes/5.12.3.md
@@ -0,0 +1,37 @@
+# CiviCRM 5.12.3
+
+Released April 20, 2019
+
+- **[Synopsis](#synopsis)**
+- **[Bugs resolved](#bugs)**
+- **[Credits](#credits)**
+- **[Feedback](#feedback)**
+
+## <a name="synopsis"></a>Synopsis
+
+| *Does this version...?* | |
+|:--------------------------------------------------------------- |:-------:|
+| Fix security vulnerabilities? | no |
+| Change the database schema? | no |
+| Alter the API? | no |
+| Require attention to configuration options? | no |
+| Fix problems installing or upgrading to a previous version? | no |
+| Introduce features? | no |
+| **Fix bugs?** | **yes** |
+
+## <a name="bugs"></a>Bugs resolved
+
+- **Fix regression in "Find Pledges" ([dev/core#887](https://lab.civicrm.org/dev/core/issues/887): [14092](https://github.com/civicrm/civicrm-core/pull/14092))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin
+Cristiano; Korlon - Stuart Gaston; Australian Greens - Seamus Lee
+
+## <a name="feedback"></a>Feedback
+
+These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
+provide feedback on them, please login to https://chat.civicrm.org/civicrm and
+contact `@agh1`.
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 7303b7a665351acb28327123478773a4f8047f9e..9eca358cfb675b6836f8e58d067388d0b53ae6aa 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -24035,4 +24035,4 @@ INSERT INTO `civicrm_report_instance`
( `domain_id`, `title`, `report_id`, `description`, `permission`, `form_values`)
VALUES
( @domainID, 'Survey Details', 'survey/detail', 'Detailed report for canvassing, phone-banking, walk lists or other surveys.', 'access CiviReport', 'a:39:{s:6:"fields";a:2:{s:9:"sort_name";s:1:"1";s:6:"result";s:1:"1";}s:22:"assignee_contact_id_op";s:2:"eq";s:25:"assignee_contact_id_value";s:0:"";s:12:"sort_name_op";s:3:"has";s:15:"sort_name_value";s:0:"";s:17:"street_number_min";s:0:"";s:17:"street_number_max";s:0:"";s:16:"street_number_op";s:3:"lte";s:19:"street_number_value";s:0:"";s:14:"street_name_op";s:3:"has";s:17:"street_name_value";s:0:"";s:15:"postal_code_min";s:0:"";s:15:"postal_code_max";s:0:"";s:14:"postal_code_op";s:3:"lte";s:17:"postal_code_value";s:0:"";s:7:"city_op";s:3:"has";s:10:"city_value";s:0:"";s:20:"state_province_id_op";s:2:"in";s:23:"state_province_id_value";a:0:{}s:13:"country_id_op";s:2:"in";s:16:"country_id_value";a:0:{}s:12:"survey_id_op";s:2:"in";s:15:"survey_id_value";a:0:{}s:12:"status_id_op";s:2:"eq";s:15:"status_id_value";s:1:"1";s:11:"custom_1_op";s:2:"in";s:14:"custom_1_value";a:0:{}s:11:"custom_2_op";s:2:"in";s:14:"custom_2_value";a:0:{}s:17:"custom_3_relative";s:1:"0";s:13:"custom_3_from";s:0:"";s:11:"custom_3_to";s:0:"";s:11:"description";s:75:"Detailed report for canvassing, phone-banking, walk lists or other surveys.";s:13:"email_subject";s:0:"";s:8:"email_to";s:0:"";s:8:"email_cc";s:0:"";s:10:"permission";s:17:"access CiviReport";s:6:"groups";s:0:"";s:9:"domain_id";i:1;}');
-UPDATE civicrm_domain SET version = '5.12.1';
+UPDATE civicrm_domain SET version = '5.12.3';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 70fb4543d51e14a6d39c23464f91bd787988da44..a042971b347ff83ccc75b7b32b1b6677468c3317 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.12.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `config_backend`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,NULL,'5.12.3',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
index 0c25b8f39366cb9a1662f08380fe05e61e4e86d0..1c3a09848fd29aac554bf227b371a162d9cafa58 100644
--- a/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
+++ b/civicrm/templates/CRM/Contribute/Page/UserDashboard.tpl
@@ -35,12 +35,12 @@
<th>{ts}Received date{/ts}</th>
<th>{ts}Receipt Sent{/ts}</th>
<th>{ts}Status{/ts}</th>
- {if $invoicing && $invoices}
+ {if $isIncludeInvoiceLinks}
<th></th>
{/if}
- {if $invoicing && $defaultInvoicePage}
+ {foreach from=$row.buttons item=button}
<th></th>
- {/if}
+ {/foreach}
</tr>
{foreach from=$contribute_rows item=row}
@@ -56,7 +56,7 @@
<td>{$row.receive_date|truncate:10:''|crmDate}</td>
<td>{$row.receipt_date|truncate:10:''|crmDate}</td>
<td>{$row.contribution_status}</td>
- {if $invoicing && $invoices}
+ {if $isIncludeInvoiceLinks}
<td>
{* @todo Instead of this tpl handling assign actions as an array attached the row, iterate through - will better accomodate extension overrides and competition for scarce real estate on this page*}
{assign var='id' value=$row.contribution_id}
@@ -75,18 +75,9 @@
{/if}
</td>
{/if}
- {if $defaultInvoicePage && $row.contribution_status_name == 'Pending' }
- {* @todo Instead of this tpl handling assign actions as an array attached the row, iterate through - will better accomodate extension overrides and competition for scarce real estate on this page*}
- <td>
- {assign var='checksum_url' value=""}
- {if $userChecksum}
- {assign var='checksum_url' value="&cid=$contactId&cs=$userChecksum"}
- {/if}
- {assign var='id' value=$row.contribution_id}
- {capture assign=payNowLink}{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$defaultInvoicePage`&ccid=`$id`$checksum_url"}{/capture}
- <a class="button" href="{$payNowLink}"><span class='nowrap'>{ts}Pay Now{/ts}</span></a>
- </td>
- {/if}
+ {foreach from=$row.buttons item=button}
+ <td><a class="{$button.class}" href="{$button.url}"><span class='nowrap'>{$button.label}</span></a></td>
+ {/foreach}
</tr>
{/foreach}
</table>
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 86599a20b585ec555466dd9bac6b108b67fac9f7..a2b0f6b12c7d38ab74d99548c061e533aeb30da7 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347::getLoader();
+return ComposerAutoloaderInit5c497419c84e5a596c5f14fa124a8318::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 7c1e41b56675df24e3fe2472b521c2ea36beee68..8857ec5bcaa1dbba64937fff93e549e0589644dd 100644
--- a/civicrm/vendor/composer/autoload_real.php
+++ b/civicrm/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347
+class ComposerAutoloaderInit5c497419c84e5a596c5f14fa124a8318
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit5c497419c84e5a596c5f14fa124a8318', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit5c497419c84e5a596c5f14fa124a8318', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInitf1d4ae0774611efaa97c899f395fd347
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequiref1d4ae0774611efaa97c899f395fd347($fileIdentifier, $file);
+ composerRequire5c497419c84e5a596c5f14fa124a8318($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequiref1d4ae0774611efaa97c899f395fd347($fileIdentifier, $file)
+function composerRequire5c497419c84e5a596c5f14fa124a8318($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;
diff --git a/civicrm/vendor/composer/autoload_static.php b/civicrm/vendor/composer/autoload_static.php
index e844bdaf639f0fde576811deb5cade7cf5e21592..3b638fd7511da6d0e3002f2fbcd551c5e25364de 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInitf1d4ae0774611efaa97c899f395fd347
+class ComposerStaticInit5c497419c84e5a596c5f14fa124a8318
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -418,11 +418,11 @@ class ComposerStaticInitf1d4ae0774611efaa97c899f395fd347
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$prefixesPsr0;
- $loader->fallbackDirsPsr0 = ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$fallbackDirsPsr0;
- $loader->classMap = ComposerStaticInitf1d4ae0774611efaa97c899f395fd347::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$prefixesPsr0;
+ $loader->fallbackDirsPsr0 = ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$fallbackDirsPsr0;
+ $loader->classMap = ComposerStaticInit5c497419c84e5a596c5f14fa124a8318::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 08e2527067287f96160d9f05168980cedd742341..0808c9aba6390c62dc2543118894f5be54cd3a88 100644
--- a/civicrm/xml/version.xml
+++ b/civicrm/xml/version.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<version>
- <version_no>5.12.1</version_no>
+ <version_no>5.12.3</version_no>
</version>