diff --git a/assets/templates/civicrm.shortcode.php b/assets/templates/civicrm.shortcode.php
index 02f45e08df0447d01c21206d6d0ccf2f03bb3bcd..c590390b01a72437875c92bd261993dddbe6abad 100644
--- a/assets/templates/civicrm.shortcode.php
+++ b/assets/templates/civicrm.shortcode.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/civicrm.php b/civicrm.php
index 5cffc1c68fe1e8f98150c9dd1234382f37ed5796..2208f646130d7465086d5ffe255de9f8a1defc4b 100644
--- a/civicrm.php
+++ b/civicrm.php
@@ -2,11 +2,10 @@
/*
Plugin Name: CiviCRM
Description: CiviCRM - Growing and Sustaining Relationships
-Version: 5.2.0
+Version: 5.2.1
Author: CiviCRM LLC
Author URI: https://civicrm.org/
Plugin URI: https://wiki.civicrm.org/confluence/display/CRMDOC/Installing+CiviCRM+for+WordPress
-GitLab Plugin URI: https://develop.tadpole.cc/plugins/civicrm
License: AGPL3
Text Domain: civicrm
Domain Path: /languages
@@ -15,7 +14,7 @@ Domain Path: /languages
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -71,7 +70,7 @@ if ( ! defined( 'ABSPATH' ) ) exit;
// set version here: when it changes, will force JS to reload
-define( 'CIVICRM_PLUGIN_VERSION', '5' );
+define( 'CIVICRM_PLUGIN_VERSION', '4.7' );
// store reference to this file
if (!defined('CIVICRM_PLUGIN_FILE')) {
@@ -309,9 +308,7 @@ class CiviCRM_For_WordPress {
if ( $this->civicrm_in_wordpress() ) {
// this is required for AJAX calls in WordPress admin
$_GET['noheader'] = TRUE;
- }
-
- if ( !CIVICRM_INSTALLED && !$this->civicrm_in_wordpress() ) {
+ } else {
$_GET['civicrm_install_type'] = 'wordpress';
}
diff --git a/civicrm/CRM/Upgrade/Incremental/sql/5.2.1.mysql.tpl b/civicrm/CRM/Upgrade/Incremental/sql/5.2.1.mysql.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..1b06ba6dab291c69a8126e10206c78f1196c14d2
--- /dev/null
+++ b/civicrm/CRM/Upgrade/Incremental/sql/5.2.1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.2.1 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 47976439518e6109f8b3ce4f5ead6a1e5ddf0353..b346331408d133edfce92167b84b922f348eaa9c 100644
--- a/civicrm/civicrm-version.php
+++ b/civicrm/civicrm-version.php
@@ -1,6 +1,6 @@
<?php
function civicrmVersion( ) {
- return array( 'version' => '5.2.0',
+ return array( 'version' => '5.2.1',
'cms' => 'Wordpress',
'revision' => '' );
}
diff --git a/civicrm/release-notes/5.2.1.md b/civicrm/release-notes/5.2.1.md
new file mode 100644
index 0000000000000000000000000000000000000000..f133f8c522227331469a7c612349cc52b93060c8
--- /dev/null
+++ b/civicrm/release-notes/5.2.1.md
@@ -0,0 +1,38 @@
+# CiviCRM 5.2.1
+
+Released June 8, 2018
+
+- **[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 5.2.0 when contribution reports include soft-credit column
+ ([12286](https://github.com/civicrm/civicrm-core/pull/12286))**
+
+## <a name="credits"></a>Credits
+
+This release was developed by the following authors and reviewers:
+
+JMA Consulting - Monish Deb; Lighthouse Design and Consulting - Brian
+Shaughnessy; Wikimedia Foundation - Eileen McNaughton
+
+## <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 48f5c517ae7d8d6665b8be372928ada4079bd9dd..51c5e21088d7968579502d193cd97903c17c7d64 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.2.0';
+UPDATE civicrm_domain SET version = '5.2.1';
diff --git a/civicrm/sql/civicrm_generated.mysql b/civicrm/sql/civicrm_generated.mysql
index e00963195f6890dfbf18828f44e38d2537b463e1..474c8329abe7d4cfa872dbef928d585fff8d4015 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.2.0',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.2.1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/civicrm/vendor/autoload.php b/civicrm/vendor/autoload.php
index 72a6b9c47e188d6c0dc599be1ba434d224b758bf..81661bf88cfc899dd2871f6c14e6051a4195b030 100644
--- a/civicrm/vendor/autoload.php
+++ b/civicrm/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
-return ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797::getLoader();
+return ComposerAutoloaderInit502a52e8a38ba5026689fe65fd301ac6::getLoader();
diff --git a/civicrm/vendor/composer/autoload_real.php b/civicrm/vendor/composer/autoload_real.php
index 4c090a43036adb4db1a9ec2e816b147aef242fdf..0d22f0d7d83a590249eaefd3bd00154db15af710 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 ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797
+class ComposerAutoloaderInit502a52e8a38ba5026689fe65fd301ac6
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInit502a52e8a38ba5026689fe65fd301ac6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInit502a52e8a38ba5026689fe65fd301ac6', 'loadClassLoader'));
$includePaths = require __DIR__ . '/include_paths.php';
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ class ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
- call_user_func(\Composer\Autoload\ComposerStaticInit7a5db276e4436c0b9224956af7d54797::getInitializer($loader));
+ call_user_func(\Composer\Autoload\ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ class ComposerAutoloaderInit7a5db276e4436c0b9224956af7d54797
$loader->register(true);
if ($useStaticLoader) {
- $includeFiles = Composer\Autoload\ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$files;
+ $includeFiles = Composer\Autoload\ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
- composerRequire7a5db276e4436c0b9224956af7d54797($fileIdentifier, $file);
+ composerRequire502a52e8a38ba5026689fe65fd301ac6($fileIdentifier, $file);
}
return $loader;
}
}
-function composerRequire7a5db276e4436c0b9224956af7d54797($fileIdentifier, $file)
+function composerRequire502a52e8a38ba5026689fe65fd301ac6($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 867a7643512303fa22a9f49a0296df40e03b2d15..7fdd1565ffe1116934217000d637c9ed1211442a 100644
--- a/civicrm/vendor/composer/autoload_static.php
+++ b/civicrm/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
namespace Composer\Autoload;
-class ComposerStaticInit7a5db276e4436c0b9224956af7d54797
+class ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6
{
public static $files = array (
'decc78cc4436b1292c6c0d151b19445c' => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib/bootstrap.php',
@@ -371,10 +371,10 @@ class ComposerStaticInit7a5db276e4436c0b9224956af7d54797
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
- $loader->prefixLengthsPsr4 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixLengthsPsr4;
- $loader->prefixDirsPsr4 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixDirsPsr4;
- $loader->prefixesPsr0 = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$prefixesPsr0;
- $loader->classMap = ComposerStaticInit7a5db276e4436c0b9224956af7d54797::$classMap;
+ $loader->prefixLengthsPsr4 = ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::$prefixLengthsPsr4;
+ $loader->prefixDirsPsr4 = ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::$prefixDirsPsr4;
+ $loader->prefixesPsr0 = ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::$prefixesPsr0;
+ $loader->classMap = ComposerStaticInit502a52e8a38ba5026689fe65fd301ac6::$classMap;
}, null, ClassLoader::class);
}
diff --git a/civicrm/xml/version.xml b/civicrm/xml/version.xml
index 6c3aafa7a2076d689bb3dea6883b707e6f628600..2bf22f12ad007935a5d9b14776687df3fad9c145 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.2.0</version_no>
+ <version_no>5.2.1</version_no>
</version>
diff --git a/includes/civicrm.basepage.php b/includes/civicrm.basepage.php
index a9d0b525de7e13ca8126f7be8855440f54b09247..78762ba06897e5761d75fa3d10d172dc7e4a64cb 100644
--- a/includes/civicrm.basepage.php
+++ b/includes/civicrm.basepage.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/includes/civicrm.shortcodes.modal.php b/includes/civicrm.shortcodes.modal.php
index 6f249e1e308df5f587beeac0af5a4a4b6986d3bf..d606a8a0b44239a22832b34bcd555614af289821 100644
--- a/includes/civicrm.shortcodes.modal.php
+++ b/includes/civicrm.shortcodes.modal.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/includes/civicrm.shortcodes.php b/includes/civicrm.shortcodes.php
index 3a8b290b3308e18e628124c030184e29c3729e64..cf3068d5ffdd62cbb7125323062b2b5a51189b6d 100644
--- a/includes/civicrm.shortcodes.php
+++ b/includes/civicrm.shortcodes.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
@@ -247,18 +247,6 @@ class CiviCRM_For_WordPress_Shortcodes {
*/
public function render_single( $atts ) {
- // Do not parse shortcodes in REST context for PUT, POST and DELETE methods
- if ( defined( 'REST_REQUEST' ) && REST_REQUEST && ( isset( $_PUT ) || isset( $_POST ) || isset( $_DELETE ) ) ) {
- // Return the original shortcode
- $shortcode = '[civicrm';
- foreach ( $atts as $att => $val ) {
- $shortcode .= ' ' . $att . '="' . $val . '"';
- }
- $shortcode .= ']';
-
- return $shortcode;
- }
-
// check if we've already parsed this shortcode
global $post;
if ( is_object($post) ) {
diff --git a/includes/civicrm.users.php b/includes/civicrm.users.php
index 800b8888eb01839c2dc2965d7e6a2aaad8310a3b..6c387d781854f30d9d303b138aad41297e22f7f0 100644
--- a/includes/civicrm.users.php
+++ b/includes/civicrm.users.php
@@ -1,7 +1,7 @@
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/languages/civicrm.pot b/languages/civicrm.pot
index 4e28eef65405b16e03f54f0622b165384f5ecd81..22349420e72fdbd042457fe592b7f43a0bd1c8a6 100644
--- a/languages/civicrm.pot
+++ b/languages/civicrm.pot
@@ -2,7 +2,7 @@
# This file is distributed under the same license as the CiviCRM package.
msgid ""
msgstr ""
-"Project-Id-Version: CiviCRM 5\n"
+"Project-Id-Version: CiviCRM 4.6\n"
"Report-Msgid-Bugs-To: http://wordpress.org/tag/civicrm\n"
"POT-Creation-Date: 2014-11-11 09:48:56+00:00\n"
"MIME-Version: 1.0\n"
diff --git a/uninstall.php b/uninstall.php
index c73696a982a1d2e246e227c3ad4a7149e04f172c..7579c21f7061c9182f0ba4514ed42b6616ef6b16 100644
--- a/uninstall.php
+++ b/uninstall.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+
diff --git a/wp-cli/civicrm.php b/wp-cli/civicrm.php
index 4a02543027e944c97824dac49a3ce430e2c77290..cce0dbd360700c25cfd7072acff8dd233266e528 100644
--- a/wp-cli/civicrm.php
+++ b/wp-cli/civicrm.php
@@ -2,7 +2,7 @@
/*
+--------------------------------------------------------------------+
- | CiviCRM version 5 |
+ | CiviCRM version 4.7 |
+--------------------------------------------------------------------+
| Copyright CiviCRM LLC (c) 2004-2018 |
+--------------------------------------------------------------------+