Media WYSIWYG View Mode configuration lost after media_wysiwyg_update_7205

Hi rooby , think you can figure out a patch between the two duplicate issues:

#2550431: View mode configuration should be stored along with the file type object, instead of variables

and

#1792738: Allow custom file view modes for WYSIWYG display
?

You had commented that 2550431 contained a patch that would have copied the settings over correctly, (however its patch didn't pass testing) could you maybe piece together the work that was done in that to make a new patch to fix this for those that haven't yet upgraded? I'd propose editing the same hook update , as those that have already upgraded probably manually restored their configuration and their old conf would have been deleted.

Nice work rooby, I'll tag this for rc3

This change caused a regression:

After updating from wetkit 4.14 to 4.15 we noticed that when we add images in the WYSIWYG they get set with a size of 100 x 100 which make them look like thumbnails.

Steps to recreate:
- Create a new wetkit 4.14 site
- Update the site to wetkit 4.15
- Edit one of the existing nodes and in the WYSWIG click the media button and add a file.

Things I tried:
- reverting the wetkit_wysiwyg module and still had the problem.
- Doing a clean wetkit 4.15 install (no update) doesn't have the problem.

When our distro upgraded from media version X to 2.0-rc3 I cloned the module from git and the issue appears when I apply this commit: http://drupalcode.org/media/commit/?id=31e20ae

If I go to the previous commit, the image gets added with no width and height.

It looks like this hook_update_n is not working properly. @nathan is going to show the exact reproduction case momentarily.

http://cgit.drupalcode.org/media/commit/?id=0e035bfd6aba4190be79df55d9f4...

Once we truncated media_view_mode_wysiwyg where everything was hard coded to wysiwyg everything worked.

Think we can keep this as fixed and just focus on related issue. If inappropriate to do so please set back.

Hi, rooby, I've recently performed update from 7.x-2.0-alpha4 to 7.x-2.16 and I noticed that it has mistakes in migrating old variables in media_wysiwyg_update_7205.

I recall this issue,
Thanks for the follow up. Push this improvement in asap.
There's still ~50000 installs that haven't yet upgraded from 1.x to 2.x

This patch should be committed to 2.x and cherry picked for 3.x and 4.x

Actually still reviewing it

Abram, I am a bit nervous about making this change, can you describe the symptoms that led you to creating this patch?

Meanwhile I will try to have a look at the various tagged releases and see what possible variations there are in the variable names.

Thanks for your feedback.

Abram, your patch looks good, thanks!

this recent change may have caused a regression for those upgrading from 7.x-1.x

still to be confirmed.