diff --git a/civicrm.php b/civicrm.php
index 176d8975017f0ad6277e39451ecd45b270c98a99..6c6db6312d5dba1284a5fcfabb11fb2284be86ea 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,7 +2,7 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.0.1
+Version: 5.0.2
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/Upgrade/Incremental/sql/5.0.2.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.0.2.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..d33cec936bc164bd4130b07fdba27b785f913b9d
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.0.2.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.0.2 during upgrade *}
diff --git a/civicrm/bower_components/jquery-ui/.bower.json b/civicrm/bower_components/jquery-ui/.bower.json
index 69ba102964fa2e81c1c7bba1451f376f5e85813e..2373c86bc68d8af7283f3ca376121214276155d6 100644
--- a/civicrm/bower_components/jquery-ui/.bower.json
+++ b/civicrm/bower_components/jquery-ui/.bower.json
@@ -16,6 +16,6 @@
"commit": "dec4c50123193d4f7c8ae6cd0bff45478e1ad276"
},
"_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 165c088f250cca8dd9891af5dc4ad269976744a9..e8daba5a197f562fead7c14f45640ab2067654e4 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,6 +1,6 @@
<?php
function civicrmVersion( ) {
- return array( 'version' => '5.0.1',
+ return array( 'version' => '5.0.2',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes/5.0.1.md b/civicrm/release-notes/5.0.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..6658c20851e7ae3d8e529614c38dcfcb862354e7
--- /dev/null
+++ b/civicrm/release-notes/5.0.1.md
@@ -0,0 +1,6 @@
+# CiviCRM 5.0.1
+
+Released Apr 18, 2018
+
+- **Backport: Dedupe - Fix for recent regression causing dedupe screen to fail on WordPress. ([11975](https://github.com/civicrm/civicrm-core/pull/11975))**
+- **Backport: VersionCheck - Get more nuanced messages from latest.civicrm.org. ([11991](https://github.com/civicrm/civicrm-core/pull/11991))**
diff --git a/civicrm/release-notes/5.0.2.md b/civicrm/release-notes/5.0.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..59b4f95ea2955c55e7d0bc6dd5d8ad4317c6d2ff
--- /dev/null
+++ b/civicrm/release-notes/5.0.2.md
@@ -0,0 +1,6 @@
+# CiviCRM 5.0.2
+
+Released Apr 25, 2018
+
+- **Backport: Use current formula for hyperlinking release notes ([12008](https://github.com/civicrm/civicrm-core/pull/12008))**
+- **Add missing release notes for 5.0.1**
diff --git a/civicrm/sql/civicrm_data.mysql b/civicrm/sql/civicrm_data.mysql
index 3d3523f973500a2191281f94354819a707298c5e..c78c583d77bfd1514cdf82c96290d7fc12a9c2c4 100644
--- a/civicrm/sql/civicrm_data.mysql
+++ b/civicrm/sql/civicrm_data.mysql
@@ -23961,4 +23961,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.0.1';
+UPDATE civicrm_domain SET version = '5.0.2';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index 15ce682eadde59174054875a0648155935f2a722..136b4951d69d2c73f4c24bbbc69085ed8969cde7 100644
--- a/civicrm/sql/civicrm_generated.mysql
+++ b/civicrm/sql/civicrm_generated.mysql
@@ -398,7 +398,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.0.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.0.2',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/common/footer.tpl b/civicrm/templates/CRM/common/footer.tpl
index 62ae51abf5f84279b4e7713da7e80bc94f8bd63a..d9ddb0d2de6c56f5b5b56c9a5e8c555358f8d5c3 100644
--- a/civicrm/templates/CRM/common/footer.tpl
+++ b/civicrm/templates/CRM/common/footer.tpl
@@ -31,7 +31,7 @@
<div class="crm-footer" id="civicrm-footer">
{crmVersion assign=version}
- {ts}Powered by CiviCRM{/ts} <a href="https://github.com/civicrm/civicrm-core/blob/{$version}/release-notes/{$version}.md">{$version}</a>.
+ {ts}Powered by CiviCRM{/ts} <a href="https://download.civicrm.org/about/{$version}">{$version}</a>.
{if !empty($footer_status_severity)}
<span class="status{if $footer_status_severity gt 3} crm-error{elseif $footer_status_severity gt 2} crm-warning{else} crm-ok{/if}">
<a href="{crmURL p='civicrm/a/#/status'}">{$footer_status_message}</a>
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 15d1dba86eca1d43d170c5da5fe61aeb66591080..fba70797258179ff8bf07f0fa5899ee3b086c1d7 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77::getLoader();
+return ComposerAutoloaderInitb241e108718908c2e104fc6a22d5523d::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index b8a9a24cc3e8ba6ec67adbb8ad3a436156bd0991..dfb80a93f312c710200d8e441bb0cc4f2b9b822a 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 ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77
+class ComposerAutoloaderInitb241e108718908c2e104fc6a22d5523d
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitb241e108718908c2e104fc6a22d5523d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitb241e108718908c2e104fc6a22d5523d', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInitb241e108718908c2e104fc6a22d5523d::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit62f1930279a40fbaeb8565f03e643e77
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInitb241e108718908c2e104fc6a22d5523d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire62f1930279a40fbaeb8565f03e643e77($fileIdentifier, $file);
+ composerRequireb241e108718908c2e104fc6a22d5523d($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire62f1930279a40fbaeb8565f03e643e77($fileIdentifier, $file)
+function composerRequireb241e108718908c2e104fc6a22d5523d($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 bb73ad416fda15512bfdaf576391f89b77b01eee..9d7737e30b816426355a83d066e014abf97dd0ab 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit62f1930279a40fbaeb8565f03e643e77
+class ComposerStaticInitb241e108718908c2e104fc6a22d5523d
{
public static $files = array (
'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
@@ -371,10 +371,10 @@ class ComposerStaticInit62f1930279a40fbaeb8565f03e643e77
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::$prefixesPsr0;
- $loader->classMap = ComposerStaticInit62f1930279a40fbaeb8565f03e643e77::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInitb241e108718908c2e104fc6a22d5523d::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInitb241e108718908c2e104fc6a22d5523d::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInitb241e108718908c2e104fc6a22d5523d::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInitb241e108718908c2e104fc6a22d5523d::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 2119a44bd389d21c7a36d218eb7e9869cc48479f..23fc4ebb5062bf8e2e5a64aae0001741edaf51e0 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.0.1</version_no>
+ <version_no>5.0.2</version_no>
</version>