From: Joey Hess <joey@kitenet.net>
Date: Wed, 21 Apr 2010 18:21:40 +0000 (-0400)
Subject: Merge branch 'master' into autotag
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/0fcbcc4815042531eb58de339844a3767fb5e707?hp=-c

Merge branch 'master' into autotag
---

0fcbcc4815042531eb58de339844a3767fb5e707
diff --combined IkiWiki.pm
index adae5d8c1,4084d4997..5355b838d
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@@ -12,20 -12,19 +12,20 @@@ use Storable
  use open qw{:utf8 :std};
  
  use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
 -	    %pagestate %wikistate %renderedfiles %oldrenderedfiles
 -	    %pagesources %destsources %depends %depends_simple %hooks
 -	    %forcerebuild %loaded_plugins %typedlinks %oldtypedlinks};
 +	%pagestate %wikistate %renderedfiles %oldrenderedfiles
 +	%pagesources %destsources %depends %depends_simple %hooks
 +	%forcerebuild %loaded_plugins %typedlinks %oldtypedlinks
 +	%autofiles};
  
  use Exporter q{import};
  our @EXPORT = qw(hook debug error template htmlpage deptype
 -                 add_depends pagespec_match pagespec_match_list bestlink
 -		 htmllink readfile writefile pagetype srcfile pagename
 -		 displaytime will_render gettext ngettext urlto targetpage
 -		 add_underlay pagetitle titlepage linkpage newpagefile
 -		 inject add_link
 -                 %config %links %pagestate %wikistate %renderedfiles
 -                 %pagesources %destsources %typedlinks);
 +	add_depends pagespec_match pagespec_match_list bestlink
 +	htmllink readfile writefile pagetype srcfile pagename
 +	displaytime will_render gettext ngettext urlto targetpage
 +	add_underlay pagetitle titlepage linkpage newpagefile
 +	inject add_link add_autofile
 +	%config %links %pagestate %wikistate %renderedfiles
 +	%pagesources %destsources %typedlinks);
  our $VERSION = 3.00; # plugin interface version, next is ikiwiki version
  our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
  our $installdir='/usr'; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
@@@ -1087,14 -1086,16 +1087,16 @@@ sub htmllink ($$$;@) 
  		$bestlink=htmlpage($bestlink);
  
  		if (! $destsources{$bestlink}) {
- 			return $linktext unless length $config{cgiurl};
- 			return "<span class=\"createlink\"><a href=\"".
- 				cgiurl(
- 					do => "create",
- 					page => lc($link),
- 					from => $lpage
- 				).
- 				"\" rel=\"nofollow\">?</a>$linktext</span>"
+ 			my $cgilink = "";
+ 			if (length $config{cgiurl}) {
+ 				$cgilink = "<a href=\"".
+ 					cgiurl(
+ 						do => "create",
+ 						page => lc($link),
+ 						from => $lpage
+ 					)."\" rel=\"nofollow\">?</a>";
+ 			}
+ 			return "<span class=\"createlink\">$cgilink$linktext</span>"
  		}
  	}
  	
@@@ -1884,7 -1885,7 +1886,7 @@@ sub define_gettext () 
  			return shift;
  		}
  	};
 -  	*ngettext=sub {
 +	*ngettext=sub {
  		$getobj->() if $getobj;
  		if ($gettext_obj) {
  			$gettext_obj->nget(@_);
@@@ -1949,15 -1950,6 +1951,15 @@@ sub add_link ($$;$) 
  	}
  }
  
 +sub add_autofile ($$$) {
 +	my $file=shift;
 +	my $plugin=shift;
 +	my $generator=shift;
 +	
 +	$autofiles{$file}{plugin}=$plugin;
 +	$autofiles{$file}{generator}=$generator;
 +}
 +
  sub sortspec_translate ($$) {
  	my $spec = shift;
  	my $reverse = shift;