Easy Template Update

Easy Template Update

Description
This Hack helps you to update your templates, by allowing you to semi-automatically merge changes into your templates.

Details
1 Product XML (5 Phrases)

This Hack is unsupported! All support requests except proved Bugs will be ignored.

[C_P]

Originally Posted by 7thgenCivic.Com

u need to do the fix in my post here https://vborg.vbsupport.ru/showpost....6&postcount=13

Thank you for reply! I did your edit but after selecting all the merge buttons and saving merge, it takes me to next page stating:
Please Complete All Required Fields
I have confirmed ALL buttons were checked so what am I missing?
Ooops wait... I may have missed something...

*Update, yup, I only pasted partial code you put rather than the entire code Andrea did and it works!!!!
Thank you!

[C_P]

Not sure why, but it looks like this is almost acting like a revert as I am losing template modifications that were done like thank you posts mod after doing the merge...

[Mastar]

Originally Posted by C_P

Thank you for reply! I did your edit but after selecting all the merge buttons and saving merge, it takes me to next page stating:
Please Complete All Required Fields
I have confirmed ALL buttons were checked so what am I missing?
Ooops wait... I may have missed something...

*Update, yup, I only pasted partial code you put rather than the entire code Andrea did and it works!!!!
Thank you!

Same thing here!

[Mastar]

Originally Posted by C_P

Not sure why, but it looks like this is almost acting like a revert as I am losing template modifications that were done like thank you posts mod after doing the merge...

That is exactly what I don't want happen. I got too many hack on my board.

[Mastar]

Originally Posted by mini2

Are you checking the checkboxes to the right of the comparison/history page, and making sure the "new" templates looks right before you save merged?

I've used this now, and it's brilliant.

Did you loose any of your hacks or had to edit the hacks back in your templates?

DID YOU DO THE EDIT ABOVE?

[Mastar]

Originally Posted by mini2

Nope, I think you just have to be careful what you do and don't decide to "merge".

So how did you did your's?

[C_P]

Originally Posted by mini2

Are you checking the checkboxes to the right of the comparison/history page, and making sure the "new" templates looks right before you save merged?

I've used this now, and it's brilliant.

I did but I am not a coder to know what should or should not be merged. I was "assuming" the merge process would merge your sections of old code to the new so there was no need to re-add this code to new section of styles changed... obviously I was mistaken and will not use this now. Oh well.

[Mastar]

I found where I went wrong,

I placed:

  $_POST['do'] = 'merge';
}

above this:

// #############################################################################
// generate a diff between two templates (current or historical versions)
if ($_REQUEST['do'] == 'viewversion')

Instead of this:

// #############################################################################
// generate a diff between two templates (current or historical versions)
if ($_POST['do'] == 'docompare')
{

So now it looks like this:

if ($_POST['do'] == 'docompare' AND !empty($_POST['domerge']))
{
  $_POST['do'] = 'merge';
}
// #############################################################################
// generate a diff between two templates (current or historical versions)
if ($_POST['do'] == 'docompare')
{
  $vbulletin->input->clean_array_gpc('p', array(
    'left_template' => TYPE_STR,
    'right_template' => TYPE_STR,
    'wrap' => TYPE_BOOL
  ));

So it works!

Can someone verify what I wrote?

[C_P]

and with the template merging I had to switch the radio buttons from my tempate being 'new to 'old' and then merge.

Now, that is an interesting statement. What you are saying is you should change the default new old option when you look at history making 3.5.2 the new and (in my case) 3.5.1 the old?

[Mastar]

Originally Posted by C_P

Now, that is an interesting statement. What you are saying is you should change the default new old option when you look at history making 3.5.2 the new and (in my case) 3.5.1 the old?

Sorry don't change the radio buttons and basically merge the peach and yellow codes and leave the green.

It works and its easy!