Fixed Merge template changes buttons

[DohTheme]

Affected version

2.3 beta 1

Hello,

The three buttons are not working

• Resolve using parent version
• Resolve using both
• Resolve using custom version

I tried using FireFox, Chrome on MacOS.

Regards

 

[Chris D]

Can you please elaborate what you mean by "not working"?

 

[DohTheme]

That means nothing happens when you click on any of them.

 

[Chris D]

Please check the browser console to see if there are any errors after clicking the buttons, and also the admin server error log.

 

[Russ]

Error shows up when you load the page:

Uncaught SyntaxError: Unexpected end of input (at admin.php?templates/message_macros.7934/merge-outdated:176:4)





Clicking the buttons don't lead to additional errors. Additionally, the merge button at the bottom is clickable before you fix the issues
2.3:




Where 2.2 you had to fix the merge issues first.

 

[Chris D]

Aha. That should be an easy fix.

 

[DohTheme]

@Russ thank you for the explanation.

@Chris D that's great.

 

[XF Bug Bot]

Thank you for reporting this issue, it has now been resolved. We are aiming to include any changes that have been made in a future XF release (2.3.0 Beta 2).

Change log:

Fix JavaScript error when merging outdated templates.

There may be a delay before changes are rolled out to the XenForo Community.

 

[Newsman]

Sooo what is a good way to handle outdated templates without the merge tool for now? Just do it manually by copying stuff over etc?

Cheers!

 

[Newsman]

This sucks and should be fixed with a hotfix honestly - I got like 30 templates to take care of manually just because of this..

 

[DohTheme]

This sucks and should be fixed with a hotfix honestly - I got like 30 templates to take care of manually just because of this..

We are in the beta phase and this is normal so please wait for xenForo 2.3 beta 2