Merge branch 'master' into tova
commit
96dab37a8e
|
@ -319,6 +319,10 @@ sub refresh () { #{{{
|
||||||
# check for added or removed pages
|
# check for added or removed pages
|
||||||
foreach my $file (@files) {
|
foreach my $file (@files) {
|
||||||
my $page=pagename($file);
|
my $page=pagename($file);
|
||||||
|
if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
|
||||||
|
# the page has changed its type
|
||||||
|
$forcerebuild{$page}=1;
|
||||||
|
}
|
||||||
$pagesources{$page}=$file;
|
$pagesources{$page}=$file;
|
||||||
if (! $pagemtime{$page}) {
|
if (! $pagemtime{$page}) {
|
||||||
if (isinternal($page)) {
|
if (isinternal($page)) {
|
||||||
|
|
|
@ -22,6 +22,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
|
||||||
* Split out error messages from editpage.tmpl into several separate
|
* Split out error messages from editpage.tmpl into several separate
|
||||||
templates.
|
templates.
|
||||||
* attachment: Do not escape _ when determining attachment filenames.
|
* attachment: Do not escape _ when determining attachment filenames.
|
||||||
|
* Rebuild pages that change their type. (Gabriel McManus)
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
|
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2008 11:35:46 -0400
|
||||||
|
|
||||||
|
|
|
@ -28,3 +28,10 @@ The relevant commits are on the master branch of [my "fork" of ikiwiki on Github
|
||||||
--Gabriel.
|
--Gabriel.
|
||||||
|
|
||||||
[github]: http://github.com/gmcmanus/ikiwiki/
|
[github]: http://github.com/gmcmanus/ikiwiki/
|
||||||
|
|
||||||
|
> Thanks for coming up with a patch, but overriding
|
||||||
|
> `Text::Markdown::_EncodeEmailAddress` gets into its internals more than
|
||||||
|
> I'm comfortable with.
|
||||||
|
>
|
||||||
|
> It would probably be best to add an option to [[cpan Text;:Markdown]] to
|
||||||
|
> let the email address munging be disabled. --[[Joey]]
|
||||||
|
|
|
@ -18,3 +18,10 @@ ikiwiki fails when trying to create a directory "a" where there is a file "a"
|
||||||
(or vice versa).
|
(or vice versa).
|
||||||
|
|
||||||
The same problem occurs if both "a" and "a.mdwn" exist in the wiki.
|
The same problem occurs if both "a" and "a.mdwn" exist in the wiki.
|
||||||
|
|
||||||
|
> Thank you for looking into it!
|
||||||
|
>
|
||||||
|
> On the use of forcerebuild, I think it's acceptable; plugins that unset
|
||||||
|
> it would break other plugins that set it, too.
|
||||||
|
>
|
||||||
|
> [[cherry-picked|done]] --[[Joey]]
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
If a file in the srcdir is removed, exposing a file in the underlaydir,
|
If a file in the srcdir is removed, exposing a file in the underlaydir,
|
||||||
ikiwiki will not notice the change and rebuild it until the file in the
|
ikiwiki will notice the removal and delete the page from the destdir. The
|
||||||
underlaydir gets a mtime newer than the mtime the removed file had.
|
page from the underlay will not be built. (However, it will be if the wiki
|
||||||
|
gets rebuilt.)
|
||||||
Relatedly, if there are two files with different extensions that build a
|
|
||||||
page with the same name, in a directory, ikiwiki will update the page
|
|
||||||
whenever either changes, using the changed one as the source. But if that
|
|
||||||
most recently changed one is removed, it won't rebuild the page using the
|
|
||||||
older one as the source.
|
|
||||||
|
|
Loading…
Reference in New Issue