Skip to content

Commit b4e3007

Browse files
tottentotten
authored
Merge pull request #16765 from totten/5.23-bump2
Version 5.23.2 - Notes and backport
2 parents d903078 + 20c8d91 commit b4e3007

File tree

7 files changed

+89
-9
lines changed

7 files changed

+89
-9
lines changed

‎CRM/Upgrade/Incremental/sql/5.23.2.mysql.tpl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{* file to handle db changes in 5.23.2 during upgrade *}

‎CRM/Utils/System/Base.php

+3-7
Original file line numberDiff line numberDiff line change
@@ -667,13 +667,9 @@ public function getCiviSourceStorage() {
667667
$baseURL = str_replace('http://', 'https://', $baseURL);
668668
}
669669

670-
if ($config->userFramework == 'Joomla') {
671-
$userFrameworkResourceURL = $baseURL . "components/com_civicrm/civicrm/";
672-
}
673-
elseif ($config->userFramework == 'WordPress') {
674-
$userFrameworkResourceURL = CIVICRM_PLUGIN_URL . "civicrm/";
675-
}
676-
elseif ($this->is_drupal) {
670+
// @todo this function is only called / code is only reached when is_drupal is true - move this to the drupal classes
671+
// and don't implement here.
672+
if ($this->is_drupal) {
677673
// Drupal setting
678674
// check and see if we are installed in sites/all (for D5 and above)
679675
// we dont use checkURL since drupal generates an error page and throws

‎CRM/Utils/System/Joomla.php

+37
Original file line numberDiff line numberDiff line change
@@ -879,4 +879,41 @@ public function synchronizeUsers() {
879879
];
880880
}
881881

882+
/**
883+
* Determine the location of the CiviCRM source tree.
884+
*
885+
* FIXME:
886+
* 1. This was pulled out from a bigger function. It should be split
887+
* into even smaller pieces and marked abstract.
888+
* 2. This would be easier to compute by a calling a CMS API, but
889+
* for whatever reason we take the hard way.
890+
*
891+
* @return array
892+
* - url: string. ex: "http://example.com/sites/all/modules/civicrm"
893+
* - path: string. ex: "/var/www/sites/all/modules/civicrm"
894+
*/
895+
public function getCiviSourceStorage() {
896+
global $civicrm_root;
897+
if (!defined('CIVICRM_UF_BASEURL')) {
898+
throw new RuntimeException('Undefined constant: CIVICRM_UF_BASEURL');
899+
}
900+
$baseURL = CRM_Utils_File::addTrailingSlash(CIVICRM_UF_BASEURL, '/');
901+
if (CRM_Utils_System::isSSL()) {
902+
$baseURL = str_replace('http://', 'https://', $baseURL);
903+
}
904+
905+
// For Joomla CiviCRM Core files always live within the admistrator folder and $base_url is different on the frontend compared to the backend.
906+
if (strpos($baseURL, 'administrator') === FALSE) {
907+
$userFrameworkResourceURL = $baseURL . "administrator/components/com_civicrm/civicrm/";
908+
}
909+
else {
910+
$userFrameworkResourceURL = $baseURL . "components/com_civicrm/civicrm/";
911+
}
912+
913+
return [
914+
'url' => CRM_Utils_File::addTrailingSlash($userFrameworkResourceURL, '/'),
915+
'path' => CRM_Utils_File::addTrailingSlash($civicrm_root),
916+
];
917+
}
918+
882919
}

‎release-notes.md

+9
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@ Other resources for identifying changes are:
1515
* https://github.com/civicrm/civicrm-joomla
1616
* https://github.com/civicrm/civicrm-wordpress
1717

18+
## CiviCRM 5.23.2
19+
20+
Released March 13, 2020
21+
22+
- **[Synopsis](release-notes/5.23.2.md#synopsis)**
23+
- **[Bugs resolved](release-notes/5.23.2.md#bugs)**
24+
- **[Credits](release-notes/5.23.2.md#credits)**
25+
- **[Feedback](release-notes/5.23.2.md#feedback)**
26+
1827
## CiviCRM 5.23.1
1928

2029
Released March 10, 2020

‎release-notes/5.23.2.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# CiviCRM 5.23.2
2+
3+
Released March 13, 2020
4+
5+
- **[Synopsis](#synopsis)**
6+
- **[Bugs resolved](#bugs)**
7+
- **[Credits](#credits)**
8+
- **[Feedback](#feedback)**
9+
10+
## <a name="synopsis"></a>Synopsis
11+
12+
| *Does this version...?* | |
13+
|:--------------------------------------------------------------- |:-------:|
14+
| Fix security vulnerabilities? | no |
15+
| Change the database schema? | no |
16+
| Alter the API? | no |
17+
| Require attention to configuration options? | no |
18+
| Fix problems installing or upgrading to a previous version? | no |
19+
| Introduce features? | no |
20+
| **Fix bugs?** | **yes** |
21+
22+
## <a name="bugs"></a>Bugs resolved
23+
24+
* **_Joomla_: Fix CiviCRM base URL on frontend pages ([dev/financial#120](https://lab.civicrm.org/dev/financial/issues/120): [#16761](https://github.com/civicrm/civicrm-core/pull/16761))**
25+
26+
## <a name="credits"></a>Credits
27+
28+
This release was developed by the following authors and reviewers:
29+
30+
Wikimedia Foundation - Eileen McNaughton; Tadpole Collective - Kevin
31+
Cristiano; laybergerF; JMA Consulting - Seamus Lee; CiviCRM - Tim Otten
32+
33+
## <a name="feedback"></a>Feedback
34+
35+
These release notes are edited by Tim Otten and Andrew Hunt. If you'd like to
36+
provide feedback on them, please login to https://chat.civicrm.org/civicrm and
37+
contact `@agh1`.

‎sql/civicrm_generated.mysql

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ UNLOCK TABLES;
399399

400400
LOCK TABLES `civicrm_domain` WRITE;
401401
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
402-
INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.23.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
402+
INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.23.2',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
403403
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
404404
UNLOCK TABLES;
405405

‎xml/version.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="iso-8859-1" ?>
22
<version>
3-
<version_no>5.23.1</version_no>
3+
<version_no>5.23.2</version_no>
44
</version>

0 commit comments

Comments
 (0)