Commit Graph

9231 Commits (dd2fa2efb956f8af6c98d37f8cfd280df2f97cb5)

Author SHA1 Message Date
Joey Hess dd2fa2efb9 When loading a template in scan mode, let preprocess know it only needs to scan.
This makes wikis such as zack's much faster in the scan pass.
In that pass, when a template contains an inline, there is no reason to
process the entire inline and all its pages. I'd forgotten to pass
along the flag to let preprocess() know it was in scan mode, leading to
much unncessary churning.
2009-03-08 18:57:47 -04:00
Joey Hess d3b4c2dbd1 avoid potential infinite loop in smiley expansion
- In 3.05, ikiwiki began expanding templates in scan mode,
  for annoying, expensive, but ultimatly necessary reasons
  of correctness.
- Smiley processing has a bug: It inserts a span for the smiley,
  and then continues searching forward in the content for more,
  starting at $end_of_smiley+1. Which means it searches for smilies
  in the span too! And if it somehow finds one, we get an infinite loop
  here.
- This bug can, probably, only be tickled if a htmllink to
  show the smiley fails, because the smiley file doesn't exist,
  or because ikiwiki doesn't know about it. In that case,
  a link will be inserted to _create_ the missing page,
  and that link will include the smiley inside the <a></a>.
- When a template is expanded in scan mode, and it contains
  an inline, the sanitize hook is run during scan mode,
  which never happened before. That causes the smiley processor
  to run, before ikiwiki is, necessarily, aware that all
  the smiley files exist (depending on scan order). So
  it inserts creation links for them, and triggers the bug.

I've put in the simple fix of jumping forward past the inserted
span, and it does fix the problem. I will need to look in a bit
more detail into why an inline nested inside a template is
fully expanded during the scan pass -- that really shouldn't
be necessary, and it makes things much slower than they need
to be.
2009-03-08 18:49:34 -04:00
Joey Hess 1edad6dca7 fix doc, prefix directives have been default for a while 2009-03-08 17:07:12 -04:00
Joey Hess 1bf100cfde configure wmd to leave text in markdown 2009-03-08 13:11:26 -04:00
Joey Hess 311182a699 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Conflicts:
	doc/todo/mdwn_preview.mdwn
2009-03-08 12:50:24 -04:00
intrigeri 5e60e13a20 details 2009-03-08 11:05:47 -04:00
intrigeri f4ae4c0b09 implemented Joey's solution 2009-03-08 15:50:48 +01:00
http://www.cse.unsw.edu.au/~willu/ ff0ae86945 License grant for my code. And note that I'll look at a more advanced version when I get time. 2009-03-08 10:39:07 -04:00
Joey Hess 1dba400c2c bug 2009-03-07 19:30:01 -05:00
Joey Hess 45129917b2 another thought 2009-03-07 19:26:46 -05:00
Joey Hess 43ebfc342c remove patch, and more comments 2009-03-07 19:23:46 -05:00
Joey Hess 9a82ef32b9 look for wmd/wmd.js
This means that the underlay needs to have a wmd/wmd/wmd.js,
which is a trifle weird, but it isolates all the wmd stuff in a
single wmd subdirectory of the built wiki. The wmd/images creating
a toplevel images directory was particularly bad.
2009-03-07 19:23:38 -05:00
Joey Hess 4e11380c75 update, add some examples 2009-03-07 19:11:34 -05:00
Joey Hess 29d387d2ba wmd stuff 2009-03-07 18:57:06 -05:00
Joey Hess 72dd9a9a04 make wmd comment support comment editing (I think) 2009-03-07 18:54:26 -05:00
Joey Hess 7ca39f49db forgot to add wmd tag here 2009-03-07 18:52:14 -05:00
Joey Hess 329f0991ef wmd copyright? 2009-03-07 18:45:55 -05:00
Joey Hess 08e4472fc4 question 2009-03-07 17:48:17 -05:00
Joey Hess 424b4602c0 note that a wmd plugin has appeared 2009-03-07 14:42:16 -05:00
Joey Hess 904b6b3e94 point at wmd plugin 2009-03-07 14:40:49 -05:00
Joey Hess e6e7e64197 comments 2009-03-07 14:38:48 -05:00
Joey Hess 029cf94493 rebuild not needed
This plugin only affects the page edit, not the compiled wiki.
2009-03-07 14:34:31 -05:00
Joey Hess e7d2da5641 wmd plugin from willu 2009-03-07 14:33:11 -05:00
Joey Hess dc4b6b1a42 Updated French translation (Jean-Luc Coulon). Closes: #518510 2009-03-06 13:36:44 -05:00
http://www.cse.unsw.edu.au/~willu/ 8333b4bbc3 Note another issue with the basic plugin. 2009-03-06 03:47:08 -05:00
http://www.cse.unsw.edu.au/~willu/ cc194fe527 Add patch for WMD plugin. This new plugin adds live preview and text controls to ikiwiki edit pages. 2009-03-06 03:40:50 -05:00
https://launchpad.net/~jelmer de695df72f 2009-03-05 16:16:54 -05:00
Joey Hess 535f70b372 Updated German translation (Kai Wasserbäch). Closes: #518377 2009-03-05 15:44:11 -05:00
http://www.cse.unsw.edu.au/~willu/ b7495e752a Notes that the wikiwyg plugin link is broken, and more. 2009-03-04 17:30:11 -05:00
Joey Hess e6298effd1 response 2009-03-04 13:58:20 -05:00
Joey Hess 6a19dacbd7 that's wikiwyg
close as dup todo
2009-03-04 13:53:34 -05:00
Joey Hess 108ad03cc8 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-03-04 13:51:55 -05:00
http://liw.fi/ 2fde5b4a6a 2009-03-04 10:19:09 -05:00
PaulePanter 2d6bbdcf3f typo and typography 2009-03-04 05:48:18 -05:00
http://sarin.myopenid.com/ 2907bec3e6 2009-03-03 21:52:36 -05:00
Víctor Moral 89bfa1e392 updated spanish translation 2009-03-03 15:08:22 -05:00
http://electropo.mp/ b3be09766b 2009-03-02 18:39:02 -05:00
Joey Hess a5f4159717 add news item for ikiwiki 3.06 2009-03-01 15:11:40 -05:00
Joey Hess 8c26a1dd8b releasing version 3.06 2009-03-01 15:11:11 -05:00
Joey Hess b7e6389605 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info 2009-03-01 15:07:14 -05:00
Joey Hess 062f87ce38 Setup automator: Fix bug in password comparison. Closes: #517654 2009-03-01 15:01:08 -05:00
bzed 2c30a32313 Adding bzed.de to ikiwikiusers 2009-02-28 21:34:04 -05:00
http://per.bothner.myopenid.com/ fb27b3b79b Add my blog. 2009-02-28 14:16:57 -05:00
http://zwol.livejournal.com/ 0bd54afd98 2009-02-27 18:57:48 -05:00
http://zwol.livejournal.com/ 2695d22490 2009-02-27 18:56:25 -05:00
Joey Hess f9efb5b1eb add news item for ikiwiki 3.05 2009-02-27 15:55:34 -05:00
Joey Hess b0117082ed releasing version 3.05 2009-02-27 15:54:52 -05:00
Joey Hess c42ad8e8de lintian fixes 2009-02-27 15:40:42 -05:00
Joey Hess 4558674d70 fix clean on clean tree 2009-02-27 15:35:40 -05:00
Joey Hess 6f3e348d31 lower debhelper build-dep
debhelper 7.0.50 will support everything needed, and will
be backported to stable
2009-02-27 15:33:50 -05:00