Merge branch 'hotfix' into hotfix-39372

.drone.yml

@@ -1,86 +1,3 @@
----
-kind: pipeline
-type: docker
-name: php5
-
-steps:
-- name: submodules
-  image: alpine/git
-  pull: if-not-exists
-  commands:
-  - git submodule update --init --recursive
-- name: neticrm ci php 5
-  image: rg.netivism.com.tw/netivism/docker-neticrm-ci:drone-php5
-  pull: always
-  environment:
-    DRUPAL: "7"
-    TZ: Asia/Taipei
-    RUNPORT: 8080
-    DRUPAL_ROOT: /var/www/html
-    CIVICRM_TEST_DSN: "mysqli://root@localhost/neticrmci"
-  commands:
-    - /usr/bin/supervisord &
-    - /init.sh
-    - cd $DRUPAL_ROOT && drush status | grep version
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit CRM/Utils/TypeTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/ALLPAYTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/SPGATEWAYTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/LinePayTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit CRM/Core/Payment/TapPayTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit api/v3/ContributionRecurTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit api/v3/GetOptionsTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit --group CItesting api/v3/PhoneTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit --group CItesting api/v3/ParticipantTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit --group CItesting api/v3/ActivityTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/phpunit && phpunit --group CItesting api/v3/MembershipTest.php
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/batch_action.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/page.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/add_contact.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/add_contribution_page.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/add_event.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_contact.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/custom_data.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_atm.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_allpay_barcode.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/new_contribution.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/advanced_search.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/add_group.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/add_membership_type.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/import.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_normal_register.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_limit_nowait_register.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_limit_wait_register.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_limit_approval_register.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_unlimit_approval_register.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/event_participant.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/edit_mailing.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_spgateway.spec.js
-    - cd $DRUPAL_ROOT/sites/all/modules/civicrm/tests/playwright/ && npx playwright test tests/contribution_booster.spec.js
-- name: notify
-  image: drillster/drone-email
-  settings:
-    from.address:
-      from_secret: email_from_addr
-    from.name:
-      from_secret: email_from_name
-    host:
-      from_secret: email_host
-    port:
-      from_secret: email_port
-    username:
-      from_secret: email_username
-    password:
-      from_secret: email_password
-    recipients:
-      from_secret: email_recipients
-    recipients_only: true
-    skip_verify: true
-  when:
-    status:
-    - failure
-
-
 ---
 kind: pipeline
 type: docker
@@ -164,8 +81,6 @@ steps:
   when:
     status:
     - failure
-depends_on:
-- php5
 
 ---
 kind: pipeline
@@ -250,6 +165,8 @@ steps:
   when:
     status:
     - failure
+depends_on:
+- php7
 
 ---
 kind: pipeline
@@ -362,4 +279,5 @@ steps:
     skip_verify: true
 depends_on:
 - php7
+- php8
 - php8-d10

CRM/Core/Page/AJAX/Location.php

@@ -94,7 +94,7 @@ function getPermissionedLocation() {
     CRM_Utils_System::civiExit();
   }
 
-  function jqState($config) {
+  public static function jqState($config) {
     $elements = array();
     if (!isset($_GET['_value']) || empty($_GET['_value']) || !CRM_Utils_Type::validate($_GET['_value'], 'Positive', FALSE)) {
       echo json_encode($elements);

CRM/SMS/Provider/Mitake.php

@@ -208,6 +208,9 @@ protected function doRequest($requestUri, $request = array()) {
       $response['raw'] = $responseBody;
       $response['body'] = $this->formatResponse($responseBody);
       $response['success'] = $response['body']['success'];
+      if (empty($response['body']['success'])) {
+        CRM_Core_Error::debug_var('mitake_send_error', $responseBody);
+      }
     }
     curl_close($ch);
 

README.md

@@ -55,10 +55,7 @@ We take the security of this project very seriously. If you believe you have fou
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.0     | :white_check_mark: |
-| < 5     | :x:                |
+Only support latest release version.
 
 ### License
 

css/civicrm.css

@@ -1750,6 +1750,7 @@ div.block-civicrm li, .crm-container ul li, .crm-container ul.treeview li {
 /* Attachment */
 .crm-container .attachments table .current-attachments img {
   max-width: 18%;
+  height: auto;
 }
 .crm-container .attachments-upload-your-own-image-row ~ .attachments-form-file-row,
 .crm-container .crm-contribution-campaign-form-block .attachments-upload-your-own-image-row ~ .attachments-form-file-row {
@@ -5504,8 +5505,10 @@ ul.ui-sortable {
 .crm-container table.criteria-group {
   margin-bottom: .1em;
 }
-
-
+.crm-container table[align="center"] {
+  margin-right: auto;
+  margin-left: auto;
+}
 .crm-container th,
 .crm-container table.display thead th,
 .crm-container table thead.sticky th,

js/Common.js

@@ -797,12 +797,17 @@ function activityStatus( message )
     } 
 }
 
-function setCookie(cname, cvalue, extsec) {
+function setCookie(cname, cvalue, extsec, path) {
     extsec = typeof extsec !== 'undefined' ? extsec : 86400;
     var d = new Date();
     d.setTime(d.getTime() + (extsec*1000));
     var expires = "expires=" + d.toGMTString();
-    document.cookie = cname+"="+cvalue+"; "+expires;
+    if (path) {
+      document.cookie = cname+"="+cvalue+"; "+expires+'; path='+path;
+    }
+    else {
+      document.cookie = cname+"="+cvalue+"; "+expires;
+    }
 }
 
 function getCookie(cname) {

packages/jquery/plugins/jquery.chainedSelects.js

@@ -49,8 +49,8 @@ jQuery.fn.chainSelect = function( target, url, settings )
 
 		ajaxCallback = function(data, textStatus) 
 		{
-			$(target).html("");//clear old options
-			data = eval(data);//get json array
+			$(target).html(""); //clear old options
+			data = JSON.parse(data); //get json array
                         if ( data != null ) {
 			    for (i = 0; i < data.length; i++) {
 				$(target).get(0).add(new Option(data[i].name, data[i].value), document.all ? i : null);