By _ch4ng3d on
Hi,
have been aplying quite a few patches by now, and always succeeded, just until now. I ran into this http://drupal.org/node/789920 patch, which seems to have somehow slightly different format than the others I've been used to:
Index: modules/overlay/overlay-parent.js
===================================================================
RCS file: /cvs/drupal/drupal/modules/overlay/overlay-parent.js,v
retrieving revision 1.40
diff -r1.40 overlay-parent.js
783c783,785
< var fragmentizedDestination = $.param.fragment(self.getPath(window.location), { overlay: params.destination });
---
> var prefix = Drupal.settings.overlay.cleanURLs?"":"%3Fq%3D";
> var fragmentizedDestination = $.param.fragment(self.getPath(window.location), { overlay: (prefix+params.destination) });
>
Index: modules/overlay/overlay.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/overlay/overlay.module,v
retrieving revision 1.17
diff -r1.17 overlay.module
502a503
> drupal_add_js(array('overlay' => array('cleanURLs' => (variable_get('clean_url', FALSE) == TRUE))), 'setting');
Tried few common patching tools (Eclipse, TortoiseMerge, ...), which usually returned something like "Unknown patch format", then I tried to patch manually but the numbers (783c783, ...) apparently do not match the actual line numbers. Did a great part of googling, but I wasn't able to find anything helpful so far. Sorry if it's a noobie issue, maybe I just googled the wrong phrases, but so far I'm really confused. Has anyone any experience with this type of diff patch? Thanks for any advice
Comments
_
That patch is almost a year old-- the odds of it still being valid with all the churn in d7 since then are virtually nil. It's a small patch-- you're better off just trying to apply it manually.
Patch
Thanks for the reply, anyway, I already applied manually the first part. The secon part is apparently a new line insertment though, and I have no goddamn clue where to put that into the overlay.module file.