From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 26 Dec 2008 19:07:25 +0000 (-0500)
Subject: Merge branch 'master' into next
X-Git-Tag: 3.00~4^2~14
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/6f1539320b7b2701d391c9921177b31898767bb7?ds=inline;hp=-c

Merge branch 'master' into next
---

6f1539320b7b2701d391c9921177b31898767bb7
diff --combined IkiWiki/Plugin/comments.pm
index c9c7b2ed4,d8318d3e3..ddaa70732
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@@ -7,7 -7,7 +7,7 @@@ package IkiWiki::Plugin::comments
  
  use warnings;
  use strict;
 -use IkiWiki 2.00;
 +use IkiWiki 3.00;
  use Encode;
  use POSIX qw(strftime);
  
@@@ -198,8 -198,17 +198,17 @@@ sub preprocess 
  			$pagestate{$page}{meta}{author} = $params{claimedauthor};
  		}
  
- 		if (defined $params{url} and safeurl($params{url})) {
- 			$pagestate{$page}{meta}{authorurl} = $params{url};
+ 		if (defined $params{url}) {
+ 			my $url=$params{url};
+ 
+ 			eval q{use URI::Heuristic}; 
+ 		  	if (! $@) {
+ 				$url=URI::Heuristic::uf_uristr($url);
+ 			}
+ 
+ 			if (safeurl($url)) {
+ 				$pagestate{$page}{meta}{authorurl} = $url;
+ 			}
  		}
  	}
  	else {
diff --combined debian/changelog
index 62ff1ba6f,96a70fcc9..9a96f7415
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,26 -1,12 +1,27 @@@
 -ikiwiki (2.72) UNRELEASED; urgency=low
 +ikiwiki (3.00) UNRELEASED; urgency=low
 +
 +  * Remove support for GlobLists.
 +  * Remove support for configuring allowed attachments, locked pages,
 +    and banned users from the admin preferences page. These can only be
 +    controlled via the setup file now.
 +  * ikiwiki-transition moveprefs can be used to move the above
 +    admin preferences into a setup file.
 +  * prefix_directives and aggregate_internal are now turned on by default.
 +  * ikiwiki-transition prefix_directives syntax changed
 +  * googlecalendar: removed this deprecated plugin. Use embed instead.
 +  * Version 3.00 of the plugin API.
 +
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:36 -0500
 +
 +ikiwiki (2.72) unstable; urgency=low
  
    * Avoid comments in recentchanges being broken links (smcv)
    * Add deprecation warning for GlobLists, which will stop working in 3.0.
    * camelcase: Add camelcase_ignore setting.
    * googlecalendar: Add runtime deprecation warning.
+   * comments: Deal with users entering unqualified or partial urls.
  
 - -- Joey Hess <joeyh@debian.org>  Mon, 22 Dec 2008 19:02:16 -0500
 + -- Joey Hess <joeyh@debian.org>  Wed, 24 Dec 2008 19:49:32 -0500
  
  ikiwiki (2.71) unstable; urgency=low