Part of meta-issue #2002650: [meta, no patch] improve maintainability by removing unused local variables

File /core/modules/content_translation/content_translation.admin.inc

Line 282: Unused local variable $bundle
Line 320: Unused local variable $entity_type
Line 321: Unused local variable $bundle
Line 405: Unused local variable $bundle
Line 453: Unused local variable $id

CommentFileSizeAuthor
#11 drupal_core-local_variable-2081151-11.patch2.16 KBtim bozeman
#5 drupal_core-local_variable-2081151-5.patch1.43 KBdeneo
#2 drupal_core-local_variable-2081151-2.patch2.39 KBPete B

Comments

beowulf1416’s picture

beowulf1416 commented
Assigned: Unassigned » beowulf1416
Pete B’s picture

Pete B commented
Status: Active » Needs review
StatusFileSize
new drupal_core-local_variable-2081151-2.patch2.39 KB

$entity_type was in use.

Here's a patch for the others.

areke’s picture

areke commented
Issue summary: View changes
Issue tags: +Needs reroll

The patch doesn't apply anymore. It should be rerolled.

areke’s picture

areke commented
Status: Needs review » Needs work
deneo’s picture

deneo commented
Status: Needs work » Needs review
StatusFileSize
new drupal_core-local_variable-2081151-5.patch1.43 KB

patch

enhdless’s picture

enhdless commented
Status: Needs review » Reviewed & tested by the community

Patch applies nicely.

xjm’s picture

xjm
she/her
Primary language English
commented
Title: Remove Unused local variable $bundle from /core/modules/content_translation/content_translation.admin.inc » Remove Unused local variables from the content_translation module
Component: other » content_translation.module
Priority: Normal » Minor
Status: Reviewed & tested by the community » Needs review

Let's also check the rest of the module and confirm that there are no other unused local variables.

parthipanramesh’s picture

parthipanramesh commented
Status: Needs review » Reviewed & tested by the community

Good work!

linl’s picture

linl commented

5: drupal_core-local_variable-2081151-5.patch queued for re-testing.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 5: drupal_core-local_variable-2081151-5.patch, failed testing.

tim bozeman’s picture

tim bozeman commented
Status: Needs work » Reviewed & tested by the community
Issue tags: -Novice, -Needs reroll
StatusFileSize
new drupal_core-local_variable-2081151-11.patch2.16 KB

I rerolled the patch from #5. It had a merge issue on line 341 of content_translation.admin.inc

<<<<<<< HEAD
    $fields = array();
    foreach ($entity_settings as $bundle => $bundle_settings) {
=======
    foreach ($entity_settings as $bundle_settings) {
>>>>>>> Applying patch from issue 2081151 comment 5

So I changed it to

    $fields = array();
    foreach ($entity_settings as $bundle_settings) {

And set the status back to RTBC.

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented
Status: Reviewed & tested by the community » Fixed

Committed and pushed to 8.x, minus the accidental default.settings.php hunk. :)

tim bozeman’s picture

tim bozeman commented

:D Whoops!

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.