Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] dev/core#1116 - Remove unused misnamed activityTypeName variable #16730

Merged

Conversation

demeritcowboy
Copy link
Contributor

Overview

"Fixes" another reference to activityTypeName where Name means Label, but this time by removing it since it's not used.

Technical Details

The variable activityTypeName (which is label - see https://github.com/civicrm/civicrm-core/blob/5.23.0/CRM/Core/BAO/OptionValue.php#L288) used to be used in ActivityView.tpl but was removed in

c27ebe4#diff-82708b475d546c52a906d4e34ff6dbbc

(and then that temporary placeholder was removed in b0a72b3#diff-82708b475d546c52a906d4e34ff6dbbc)

The only files ActivityView.tpl further {include}'s is formButtons, so it isn't used in an {include}.

It's possible some local customization on a site is using it in their smarty template, but I don't think you can deprecate smarty variables.

The local php variable in ActivityView.php isn't used anywhere else in the file.

Comments

The diff seems easier to read in github if you use split view instead of unified.

@civibot
Copy link

civibot bot commented Mar 9, 2020

(Standard links)

@civibot civibot bot added the master label Mar 9, 2020
@eileenmcnaughton
Copy link
Contributor

I agree this is unused. Test fail unrelated

Screenshot is the same before & after - why do we put subject so low down? & date & status - they should all be at the top - sigh

Screen Shot 2020-03-12 at 5 21 38 PM

@eileenmcnaughton eileenmcnaughton merged commit bfbbe0d into civicrm:master Mar 12, 2020
@demeritcowboy demeritcowboy deleted the unused-activitytypename branch March 12, 2020 13:00
@demeritcowboy
Copy link
Contributor Author

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants