From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 8 May 2009 23:33:17 +0000 (+0200)
Subject: Merge
X-Git-Tag: release-0.3.33~44
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap-cgi.git;a=commitdiff_plain;h=39f1dbe07f85a3c83b181c88ddf639a256757779;hp=49bc81d424f8f855bd39d281a385d0de93151f63

Merge
---

diff --git a/debian/changelog b/debian/changelog
index 0b03853..568ac49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+userdir-ldap-cgi (0.3.26) unstable; urgency=low
+
+  * In machines.cgi: do not skip [[- purposes. "[[-<hostname>]]" gets
+    stuff added to ssh_known_hosts but not http linked.
+
+ -- Peter Palfrader <weasel@debian.org>  Sat, 09 May 2009 01:29:52 +0200
+
 userdir-ldap-cgi (0.3.25) unstable; urgency=low
 
   * Util.pm: change capath /etc/ssl/certs to
diff --git a/machines.cgi b/machines.cgi
index d67aa3f..4108fff 100755
--- a/machines.cgi
+++ b/machines.cgi
@@ -90,9 +90,9 @@ sub wiki_link($) {
 	# [[hostname]] makes a link too
 	# if you add a * after [[ it's still the same, only not used for ssh_known_hosts in ud-generate
 	# [[-hostname]] are not links, but get added to known_hosts.  we should drop the [[- ]] tho
+	$in =~ s#\[\[-(.*?)\]\]#$1#g;
 	$in =~ s#\[\[\*?(.*?)\|(.*?)\]\]#<a href="http://$1">$2</a>#g;
 	$in =~ s#\[\[\*?(.*?)\]\]#<a href="http://$1">$1</a>#g;
-	$in =~ s#\[\[-(.*?)\]\]#$1#g;
 	return $in;
 }
 
@@ -106,7 +106,7 @@ sub wiki_link($) {
 sub item_uplist($) {
 	my ($items) = @_;
 	my $out = undef;
-	my(@tmp) = grep(!/\[\[-/, @$items);
+	my(@tmp) = @$items;
 
 	if (scalar @tmp>= 1) {
 		$out = "<ul>".