[dokuwiki] problem after patching via darcs plugin

  • From: Werner Flamme <werner.flamme@xxxxxx>
  • To: Mailingliste DokuWiki <dokuwiki@xxxxxxxxxxxxx>
  • Date: Wed, 12 Jul 2006 13:02:21 +0200

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I just used the darcs plugin to update my installation. Something went
wrong, in inc/template.php I read:

- ---snip---
v v v v v v v
  trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln');
*************
  trigger_event('TPL_CONTENT_DISPLAY',$html_output,ptln);

  return $html_output;
^ ^ ^ ^ ^ ^ ^
- ---pins---

and, of course, this is not valid PHP code. The line "return $html_output;"
I added for my PDF export (see
http://wiki.splitbrain.org/users:wflamme:pdfdownload). After adding this
line, I used "darcs record" so darcs should know about this line (and the
other changes I made for "pdfdownload").

I saw this at home as well here in the office - the reason seems to be Ben
Coburn's patch 20060710091820 'Undefined constants replaced with strings',
at least this is the caption I found in __darcs/patches/pending_buggy.

First: it would be nice if the darcs plugin would give some hints about the
existence of this file.
Second: it would be nice if there was an advice what to do with this file.
I do not know how to apply those "buggy" lines. I thought after using
"darcs record" darcs cares about applying patches to files that are
different from the original ones.

Someone please put me on the right track? TIA!

Regards,
Werner

- --
Werner Flamme, Abt. WKDV
UFZ Umweltforschungszentrum Leipzig-Halle GmbH,
Permoserstr. 15 - 04318 Leipzig
Tel.: (0341) 235-3921 - Fax (0341) 235-453921
http://www.ufz.de - eMail: werner.flamme@xxxxxx




-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFEtNa8k33Krq8b42MRAuVhAJ9Yv0h/DPsjoBWlJDc6zPYvdl6tJwCfTa2J
R6ZPgikHEV9J2YMzgUUAM5I=
=7JWW
-----END PGP SIGNATURE-----
-- 
DokuWiki mailing list - more info at
http://wiki.splitbrain.org/wiki:mailinglist

Other related posts: