civicrm-core.git
4 years agodistmaker - Remove steps to download api4 as extension
Tim Otten [Wed, 18 Sep 2019 23:59:47 +0000 (19:59 -0400)]
distmaker - Remove steps to download api4 as extension

This is no longer necessary since it's part of core!

4 years agocomposer.json - Add "ignore" list for js-yaml
Tim Otten [Wed, 18 Sep 2019 23:54:07 +0000 (19:54 -0400)]
composer.json - Add "ignore" list for js-yaml

4 years agoAdd api4 menu item
Coleman Watts [Tue, 17 Sep 2019 12:48:14 +0000 (08:48 -0400)]
Add api4 menu item

4 years agoFix api explorer module loading
Coleman Watts [Mon, 16 Sep 2019 20:31:24 +0000 (16:31 -0400)]
Fix api explorer module loading

4 years agoApi4 generated code improvements
Coleman Watts [Mon, 16 Sep 2019 15:41:05 +0000 (11:41 -0400)]
Api4 generated code improvements

Ports https://github.com/civicrm/org.civicrm.api4/pull/201 to core.

4 years agoUpdate namespace for phpunit6 compat
Coleman Watts [Mon, 16 Sep 2019 15:00:08 +0000 (11:00 -0400)]
Update namespace for phpunit6 compat

4 years agoTest fixes
Coleman Watts [Mon, 16 Sep 2019 12:09:05 +0000 (08:09 -0400)]
Test fixes

4 years agoapi4 - Search for entities in core (for realz)
Tim Otten [Sun, 15 Sep 2019 19:24:57 +0000 (15:24 -0400)]
api4 - Search for entities in core (for realz)

4 years agoapi4 - Fix container cache/reload behavior
Tim Otten [Sun, 15 Sep 2019 18:19:06 +0000 (14:19 -0400)]
api4 - Fix container cache/reload behavior

In the extension's `tests/phpunit/bootstrap.php`, it forced the container to
*never* use caching. I suspect this was because of two problems:

1. APIv4 does a directory scan for services, but it didn't inform
   the container that this directory was important.

2. APIv4 registers additional services for a test environment, but the
   caching system didn't allow different caches for live-vs-test env's.

4 years agoapi4 - Fix computation of core path
Tim Otten [Sun, 15 Sep 2019 18:12:52 +0000 (14:12 -0400)]
api4 - Fix computation of core path

The `$locations` array mostly contains the paths of *extension PHP files*,
and the subsequent code filters with`dirname()` to strip them out.

Before: The path `/var/www/sites/all/modules/civicrm` was digested to
        `/var/www/sites/all/modules/Civi/Api4/Subscribers`.

After:  The path `/var/www/sites/all/modules/civicrm/Civi.php` is digested
        `/var/www/sites/all/modules/civicrm/Civi/Api4/Subscribers`.

4 years ago(NFC) Pass both civilint and ReflectionUtilsTest
Tim Otten [Sun, 15 Sep 2019 17:17:38 +0000 (13:17 -0400)]
(NFC) Pass both civilint and ReflectionUtilsTest

4 years agoScan core as well as extensions for api4 entities & services
Coleman Watts [Sun, 15 Sep 2019 14:51:54 +0000 (10:51 -0400)]
Scan core as well as extensions for api4 entities & services

4 years agoSearch for entity-specific actions in core
colemanw [Sun, 15 Sep 2019 14:23:27 +0000 (10:23 -0400)]
Search for entity-specific actions in core

4 years agoapi4 - Update test init
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Update test init

4 years agoapi4 - Adjust to new name
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Adjust to new name

4 years agoapi4 - Import CRM/, Civi/, templates/, ang/, css/, js/, xml/menu
CiviCRM [Sun, 15 Sep 2019 03:48:45 +0000 (23:48 -0400)]
api4 - Import CRM/, Civi/, templates/, ang/, css/, js/, xml/menu

4 years agoapi4 - Enable services
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Enable services

4 years agoapi4 - Add civicrm_api4() and CRM.api4() entry-points
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Add civicrm_api4() and CRM.api4() entry-points

4 years agoapi4 - Port PHPUnit autoloading hacks
CiviCRM [Sun, 15 Sep 2019 03:48:43 +0000 (23:48 -0400)]
api4 - Port PHPUnit autoloading hacks

4 years agoHandle new flattened custom field return format
Coleman Watts [Sat, 14 Sep 2019 22:45:22 +0000 (18:45 -0400)]
Handle new flattened custom field return format

4 years agoObsolete api4 extension
Coleman Watts [Sat, 14 Sep 2019 22:39:32 +0000 (18:39 -0400)]
Obsolete api4 extension

4 years agoMerge pull request #15295 from colemanw/jsEncode2
Tim Otten [Sat, 14 Sep 2019 16:18:19 +0000 (12:18 -0400)]
Merge pull request #15295 from colemanw/jsEncode2

CRM_Utils_JS - Improve encode handling of strings

4 years agoMerge pull request #15308 from colemanw/prioriy
Tim Otten [Sat, 14 Sep 2019 15:59:23 +0000 (11:59 -0400)]
Merge pull request #15308 from colemanw/prioriy

[NFC] Reword event docs to clarify priority vs weight

4 years agoReword event docs to clarify priority vs weight
Coleman Watts [Sat, 14 Sep 2019 14:22:03 +0000 (10:22 -0400)]
Reword event docs to clarify priority vs weight

4 years agoMerge pull request #15303 from agileware/CIVICRM-1310
Eileen McNaughton [Fri, 13 Sep 2019 13:30:45 +0000 (01:30 +1200)]
Merge pull request #15303 from agileware/CIVICRM-1310

Update CiviCRM contributors.txt

4 years agoMerge pull request #15301 from seamuslee001/dev_core_1245_2
Seamus Lee [Fri, 13 Sep 2019 05:49:09 +0000 (15:49 +1000)]
Merge pull request #15301 from seamuslee001/dev_core_1245_2

[NFC] Add in code comments about the column default issue with is_ema…

4 years agoCIVICRM-1310 Update CiviCRM contributors.txt - remove Alok and add Pengyi
Justin Freeman [Fri, 13 Sep 2019 05:07:41 +0000 (15:07 +1000)]
CIVICRM-1310 Update CiviCRM contributors.txt - remove Alok and add Pengyi

4 years agoMerge pull request #15300 from civicrm/5.18
Eileen McNaughton [Fri, 13 Sep 2019 04:29:01 +0000 (16:29 +1200)]
Merge pull request #15300 from civicrm/5.18

5.18

4 years ago[NFC] Add in code comments about the column default issue with is_email_receipt in...
Seamus Lee [Fri, 13 Sep 2019 03:55:48 +0000 (13:55 +1000)]
[NFC] Add in code comments about the column default issue with is_email_receipt in case anyone else comes across this

4 years agoMerge pull request #15299 from seamuslee001/5.18
Tim Otten [Fri, 13 Sep 2019 03:17:07 +0000 (23:17 -0400)]
Merge pull request #15299 from seamuslee001/5.18

Add release-notes/5.17.4

4 years agoAdd release-notes/5.17.4
Tim Otten [Fri, 13 Sep 2019 03:11:32 +0000 (23:11 -0400)]
Add release-notes/5.17.4

4 years agoMerge pull request #15296 from eileenmcnaughton/518
Tim Otten [Fri, 13 Sep 2019 03:04:03 +0000 (23:04 -0400)]
Merge pull request #15296 from eileenmcnaughton/518

dev/core#1241 : Custom field value for a new Event based on an Event …

4 years agodev/core#1241 : Custom field value for a new Event based on an Event Template are...
Monish Deb [Thu, 12 Sep 2019 09:10:43 +0000 (14:40 +0530)]
dev/core#1241 : Custom field value for a new Event based on an Event Template are not checked causing false validation message and Event not to save

4 years agoCRM_Utils_JS - Fix backslash handling
Coleman Watts [Fri, 13 Sep 2019 01:58:23 +0000 (21:58 -0400)]
CRM_Utils_JS - Fix backslash handling

4 years agoCRM_Utils_JS - Improve encode handling of strings
Coleman Watts [Thu, 12 Sep 2019 16:45:20 +0000 (12:45 -0400)]
CRM_Utils_JS - Improve encode handling of strings

4 years agoMerge pull request #15290 from civicrm/5.18
Eileen McNaughton [Thu, 12 Sep 2019 02:00:16 +0000 (14:00 +1200)]
Merge pull request #15290 from civicrm/5.18

5.18

4 years agoMerge pull request #15289 from colemanw/export-rc
Eileen McNaughton [Thu, 12 Sep 2019 01:59:27 +0000 (13:59 +1200)]
Merge pull request #15289 from colemanw/export-rc

dev/core#1246 fix fatal error on search builder if a core contact type is disabled

4 years agoMerge pull request #15287 from MegaphoneJon/core-1247-518
Eileen McNaughton [Thu, 12 Sep 2019 01:59:09 +0000 (13:59 +1200)]
Merge pull request #15287 from MegaphoneJon/core-1247-518

Fix for core#1247 - export hook doesn't work

4 years agoMerge pull request #15285 from colemanw/jsencode
Tim Otten [Thu, 12 Sep 2019 00:48:10 +0000 (17:48 -0700)]
Merge pull request #15285 from colemanw/jsencode

Add CRM_Utils_JS::encode function

4 years agoMerge pull request #15282 from christianwach/lab-1200-2
Seamus Lee [Thu, 12 Sep 2019 00:29:36 +0000 (10:29 +1000)]
Merge pull request #15282 from christianwach/lab-1200-2

Ensure Dashboard domain ID is set even when passed as a param

4 years agodev/core#1246 fix fatal error on search builder if a core contact type is disabled.
eileen [Wed, 11 Sep 2019 07:13:34 +0000 (19:13 +1200)]
dev/core#1246 fix fatal error on search builder if a core contact type is disabled.

https://lab.civicrm.org/dev/core/issues/1246

4 years agoMerge pull request #15228 from jitendrapurohit/15094-test
Seamus Lee [Wed, 11 Sep 2019 23:33:46 +0000 (09:33 +1000)]
Merge pull request #15228 from jitendrapurohit/15094-test

Unit test for #15094 fix

4 years agoMerge pull request #15288 from seamuslee001/5.18
Eileen McNaughton [Wed, 11 Sep 2019 23:33:12 +0000 (11:33 +1200)]
Merge pull request #15288 from seamuslee001/5.18

Add release notes for 5.17.3

4 years agoAdd release notes for 5.17.3
Tim Otten [Wed, 11 Sep 2019 04:47:13 +0000 (21:47 -0700)]
Add release notes for 5.17.3

4 years agoFix for core#1247 - export hook doesn't work
Jon Goldberg [Tue, 10 Sep 2019 16:15:31 +0000 (12:15 -0400)]
Fix for core#1247 - export hook doesn't work

4 years agoAdd CRM_Utils_JS::encode function
Coleman Watts [Wed, 11 Sep 2019 21:51:47 +0000 (17:51 -0400)]
Add CRM_Utils_JS::encode function

4 years agoMerge pull request #15280 from mattwire/formatpaymentparams
Eileen McNaughton [Wed, 11 Sep 2019 18:22:18 +0000 (06:22 +1200)]
Merge pull request #15280 from mattwire/formatpaymentparams

REF Make the formatParamsForPaymentProcessor function more generic so it can be used more

4 years agoMake the formatParamsForPaymentProcessor function more generic so it can be used...
Matthew Wire (MJW Consulting) [Tue, 10 Sep 2019 22:40:24 +0000 (23:40 +0100)]
Make the formatParamsForPaymentProcessor function more generic so it can be used more

4 years agoEnsure Dashboard domain ID is set even when passed as a param
Christian Wach [Wed, 11 Sep 2019 12:20:44 +0000 (13:20 +0100)]
Ensure Dashboard domain ID is set even when passed as a param

4 years agoMerge pull request #15094 from mattwire/devcore792_membershipcontributionfail
Eileen McNaughton [Wed, 11 Sep 2019 09:23:45 +0000 (21:23 +1200)]
Merge pull request #15094 from mattwire/devcore792_membershipcontributionfail

dev/core#792 Fix Contributions not recording if selected membership is none when using a membership priceset

4 years agoMerge pull request #15263 from JMAConsulting/financial-67
Eileen McNaughton [Wed, 11 Sep 2019 07:28:50 +0000 (19:28 +1200)]
Merge pull request #15263 from JMAConsulting/financial-67

financial#67 : Check number doesn't show up if payment method name - Check changed to Cheque

4 years agoMerge pull request #15272 from seamuslee001/dev_financial_68
Seamus Lee [Wed, 11 Sep 2019 07:13:44 +0000 (17:13 +1000)]
Merge pull request #15272 from seamuslee001/dev_financial_68

dev/financial#68 Ensure that check number is correctly passed through…

4 years agoExtend contribution api test to ensure that if check_number is specified in unique...
Seamus Lee [Wed, 11 Sep 2019 03:08:17 +0000 (13:08 +1000)]
Extend contribution api test to ensure that if check_number is specified in unique field it is still correctly stored

Add in a unit test to test setting check_number with original field

4 years agoMerge pull request #15270 from civicrm/5.18
Eileen McNaughton [Wed, 11 Sep 2019 03:07:53 +0000 (15:07 +1200)]
Merge pull request #15270 from civicrm/5.18

5.18

4 years agoMerge pull request #15275 from eileenmcnaughton/email
Eileen McNaughton [Wed, 11 Sep 2019 03:07:33 +0000 (15:07 +1200)]
Merge pull request #15275 from eileenmcnaughton/email

Trim form values when adding LIKE operator

4 years agoMerge pull request #15276 from eileenmcnaughton/email2
Eileen McNaughton [Wed, 11 Sep 2019 03:07:17 +0000 (15:07 +1200)]
Merge pull request #15276 from eileenmcnaughton/email2

Ensure filtering on email via the api looks for an exact match

4 years agoMerge pull request #15273 from eileenmcnaughton/518
Eileen McNaughton [Wed, 11 Sep 2019 01:53:41 +0000 (13:53 +1200)]
Merge pull request #15273 from eileenmcnaughton/518

Fix unreleased regression on batch merge through the UI

4 years agoMerge pull request #15274 from totten/master-deadcode
Eileen McNaughton [Wed, 11 Sep 2019 01:53:25 +0000 (13:53 +1200)]
Merge pull request #15274 from totten/master-deadcode

(REF) Remove unused functions, setTemplateMenuValues() and getNavigation()

4 years agoEnsure filtering on email via the api looks for an exact match
eileen [Wed, 11 Sep 2019 01:49:06 +0000 (13:49 +1200)]
Ensure filtering on email  via the api  looks for an exact match

4 years agoTrim form values when adding LIKE operator
eileen [Wed, 11 Sep 2019 01:33:36 +0000 (13:33 +1200)]
Trim form values when adding LIKE operator

This is more consistent with previous behaviour - ie 'info@civicrm.org' AND 'info@civicrm.org ' should work.

4 years ago(REF) Remove unused function CRM_Core_Menu::getNavigation()
Tim Otten [Tue, 10 Sep 2019 23:39:26 +0000 (16:39 -0700)]
(REF) Remove unused function CRM_Core_Menu::getNavigation()

I stumbled across this function while grepping to cleanup up
`userFrameworkURLVar` (dev/drupal#52).  Notice the first line of the
function throws a fatal error.  That line has been there since at least
CiviCRM v4.3.

https://github.com/civicrm/civicrm-core/blob/4.3/CRM/Core/Menu.php#L310

Unsurprisingly, if you grep for `getNavigation`, there are no calls to this
function.

4 years ago(REF) Remove unused function CRM_Core_Block::setTemplateMenuValues
Tim Otten [Tue, 10 Sep 2019 23:33:32 +0000 (16:33 -0700)]
(REF) Remove unused function CRM_Core_Block::setTemplateMenuValues

Note that this is a `private` function, so any hypothetical callers must be
in the same class. There don't appear to be any.

Could there be some dynamic method calls?  Well, you'd expect there to be
some tell-tale such as references to `call_*()` or to a string which builds
up that method name from smaller strings ("set" or "MenuValues" or similar).
Nothing comes up.

4 years agoFix unreleased regression on batch merge through the UI
eileen [Tue, 10 Sep 2019 23:17:33 +0000 (11:17 +1200)]
Fix unreleased regression on batch merge through the UI

We made searchLimit part of the cacheKey for found batches but in this place missed passing it in,
leading to it  not picking up the relevant cached entries & skipping them. Affects 5.18 rc & master

4 years agoAdd a unit test to ensure that check_number when submitted to the form as contributio...
Seamus Lee [Tue, 10 Sep 2019 23:22:02 +0000 (09:22 +1000)]
Add a unit test to ensure that check_number when submitted to the form as contribution_check_number is correctly saved into the financial Transaction

4 years agodev/financial#68 Ensure that check number is correctly passed through when processing...
Seamus Lee [Tue, 10 Sep 2019 23:06:40 +0000 (09:06 +1000)]
dev/financial#68 Ensure that check number is correctly passed through when processing a contribution or membership batch

4 years agoMerge pull request #15268 from mlutfy/partialFixDrupal8q-518
Seamus Lee [Tue, 10 Sep 2019 22:38:03 +0000 (08:38 +1000)]
Merge pull request #15268 from mlutfy/partialFixDrupal8q-518

dev/drupal#52 Partial fix for Deprecated q variable

4 years agoMerge pull request #15261 from JKingsnorth/report-paths-not-public
Seamus Lee [Tue, 10 Sep 2019 22:23:45 +0000 (08:23 +1000)]
Merge pull request #15261 from JKingsnorth/report-paths-not-public

Remove is_public flag from report paths

4 years agodev/drupal#52 Partial fix for Deprecated q variable
Mathieu Lutfy [Tue, 10 Sep 2019 13:24:48 +0000 (09:24 -0400)]
dev/drupal#52 Partial fix for Deprecated q variable

4 years agofinancial#67 : Check number doesn't show up if payment method name - Check changed...
Monish Deb [Tue, 10 Sep 2019 11:32:01 +0000 (17:02 +0530)]
financial#67 : Check number doesn't show up if payment method name - Check changed to Cheque

4 years agoRemove is_public flag from report paths
John Kingsnorth [Tue, 10 Sep 2019 09:44:01 +0000 (10:44 +0100)]
Remove is_public flag from report paths

Even though these paths are publicly accessible, they are not intended as 'public' paths

4 years agoMerge pull request #15260 from seamuslee001/5_17_2_release_notes
Tim Otten [Tue, 10 Sep 2019 06:35:52 +0000 (23:35 -0700)]
Merge pull request #15260 from seamuslee001/5_17_2_release_notes

(NFC) 5 17 2 release notes

4 years agoUpdate 5.17.2.md
Tim Otten [Tue, 10 Sep 2019 05:46:06 +0000 (22:46 -0700)]
Update 5.17.2.md

4 years agoUpdate 5.17.2.md
Tim Otten [Tue, 10 Sep 2019 05:44:49 +0000 (22:44 -0700)]
Update 5.17.2.md

4 years agoAdd in release notes and bump version to be 5.17.2
Seamus Lee [Tue, 10 Sep 2019 03:38:52 +0000 (13:38 +1000)]
Add in release notes and bump version to be 5.17.2

4 years agoMerge pull request #15256 from civicrm/5.18
Eileen McNaughton [Tue, 10 Sep 2019 03:39:47 +0000 (15:39 +1200)]
Merge pull request #15256 from civicrm/5.18

5.18

4 years agoMerge pull request #15255 from eileenmcnaughton/518
Seamus Lee [Tue, 10 Sep 2019 03:33:26 +0000 (13:33 +1000)]
Merge pull request #15255 from eileenmcnaughton/518

dev/core#1244 Fix regression on searching by email in advanced search

4 years agoFix regression on searching by contact in advanced search
eileen [Mon, 9 Sep 2019 22:14:49 +0000 (10:14 +1200)]
Fix regression on searching by contact in advanced search

4 years agoMerge pull request #15253 from seamuslee001/5.18
Tim Otten [Mon, 9 Sep 2019 23:30:15 +0000 (16:30 -0700)]
Merge pull request #15253 from seamuslee001/5.18

Add in 5.17.1 Release notes and migrate .tpl file for 5.17.1 to 5.18 to support upgrade

4 years agoMerge pull request #15132 from andrewpthompson/joomla4-frontend-compatibility
Seamus Lee [Mon, 9 Sep 2019 22:27:25 +0000 (08:27 +1000)]
Merge pull request #15132 from andrewpthompson/joomla4-frontend-compatibility

(dev/joomla#22) Fix deprecated JRequest for Joomla 4.0

4 years agoAdd in 5.17.1.mysql.tpl file to support fix for upgrade
Seamus Lee [Mon, 9 Sep 2019 21:58:24 +0000 (07:58 +1000)]
Add in 5.17.1.mysql.tpl file to support fix for upgrade

4 years agoUpdate 5.17.1.md
Tim Otten [Mon, 9 Sep 2019 21:50:12 +0000 (14:50 -0700)]
Update 5.17.1.md

4 years agoAdd in release notes for 5.17.1 release
Seamus Lee [Sat, 7 Sep 2019 23:02:06 +0000 (09:02 +1000)]
Add in release notes for 5.17.1 release

4 years agoMerge pull request #15251 from yashodha/report_cleanup
Eileen McNaughton [Mon, 9 Sep 2019 20:42:13 +0000 (08:42 +1200)]
Merge pull request #15251 from yashodha/report_cleanup

CRM-21677 - report clean up for participant reports

4 years agoMerge pull request #15250 from eileenmcnaughton/nfc
Eileen McNaughton [Mon, 9 Sep 2019 20:41:49 +0000 (08:41 +1200)]
Merge pull request #15250 from eileenmcnaughton/nfc

[NFC] array formatting:

4 years agoCRM-21677 - report clean up for participant reports
yashodha [Mon, 9 Sep 2019 08:25:09 +0000 (13:55 +0530)]
CRM-21677 - report clean up for participant reports

4 years ago[NFC] array formatting:
eileen [Sun, 8 Sep 2019 22:15:30 +0000 (10:15 +1200)]
[NFC] array formatting:

4 years agoMerge pull request #15249 from civicrm/5.18
Eileen McNaughton [Sun, 8 Sep 2019 20:48:21 +0000 (08:48 +1200)]
Merge pull request #15249 from civicrm/5.18

5.18 to master

4 years agoMerge pull request #15247 from seamuslee001/5.18
Eileen McNaughton [Sun, 8 Sep 2019 20:47:50 +0000 (08:47 +1200)]
Merge pull request #15247 from seamuslee001/5.18

[NFC] Update Default report instances that filter on join date to be …

4 years agoMerge pull request #15245 from seamuslee001/lab_core_1240
Eileen McNaughton [Sun, 8 Sep 2019 20:47:17 +0000 (08:47 +1200)]
Merge pull request #15245 from seamuslee001/lab_core_1240

dev/core#1240 Ensure that Options are not duplicated when saving a co…

4 years ago[NFC] Update Default report instances that filter on join date to be the correct...
Seamus Lee [Sun, 8 Sep 2019 03:58:43 +0000 (13:58 +1000)]
[NFC] Update Default report instances that filter on join date to be the correct field following datepicker change

4 years agoMerge pull request #15243 from eileenmcnaughton/export_wip
Seamus Lee [Sat, 7 Sep 2019 22:44:52 +0000 (08:44 +1000)]
Merge pull request #15243 from eileenmcnaughton/export_wip

Declare metadata for component payment fields on export

4 years agodev/core#1240 Ensure that Options are not duplicated when saving a contribution or...
Seamus Lee [Sat, 7 Sep 2019 22:35:30 +0000 (08:35 +1000)]
dev/core#1240 Ensure that Options are not duplicated when saving a contribution or event page when specifying the options

4 years agoDeclare metadata for component payment fields on export
eileen [Sun, 28 Jul 2019 21:35:33 +0000 (09:35 +1200)]
Declare metadata for component payment fields on export

Towards metadata for all fields

4 years agoMerge pull request #15241 from civicrm/5.18
Eileen McNaughton [Sat, 7 Sep 2019 21:10:43 +0000 (09:10 +1200)]
Merge pull request #15241 from civicrm/5.18

5.18 to master

4 years agoMerge pull request #15239 from demeritcowboy/fix-pptx-upgrade-task
Eileen McNaughton [Sat, 7 Sep 2019 21:10:20 +0000 (09:10 +1200)]
Merge pull request #15239 from demeritcowboy/fix-pptx-upgrade-task

dev/core#1190 - typo in original version of upgrade function

4 years agoMerge pull request #15178 from eileenmcnaughton/wp
Eileen McNaughton [Sat, 7 Sep 2019 21:08:01 +0000 (09:08 +1200)]
Merge pull request #15178 from eileenmcnaughton/wp

Fix php 7.2+ deprecation error

4 years agoFix php 7.2+ deprecation error
eileen [Sat, 31 Aug 2019 22:01:11 +0000 (10:01 +1200)]
Fix php 7.2+ deprecation error

4 years agoMerge pull request #15240 from demeritcowboy/avoid-variable-name-conflict
Eileen McNaughton [Sat, 7 Sep 2019 21:06:05 +0000 (09:06 +1200)]
Merge pull request #15240 from demeritcowboy/avoid-variable-name-conflict

dev/core#1123 - avoid possible variable name clash

4 years agoavoid variable name clash
DemeritCowboy [Sat, 7 Sep 2019 12:28:43 +0000 (08:28 -0400)]
avoid variable name clash

4 years agotypo in original version of function
DemeritCowboy [Sat, 7 Sep 2019 12:14:50 +0000 (08:14 -0400)]
typo in original version of function