From 5b4133d50626337c8d058f843c54867fc40d3068 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlHLiVkr16cy4E11FqrDFre19QM_5u3hBo" Date: Wed, 24 Dec 2014 10:23:01 -0400 Subject: Create new TODO for minor makefile patches --- ...d_use_MAKE_in___39__po__47__Makefile__39__.mdwn | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn diff --git a/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn new file mode 100644 index 000000000..4b84e56b5 --- /dev/null +++ b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn @@ -0,0 +1,65 @@ +The `PM_FILTER` doesn't include the `DESTDIR` variable. This means that, if you use it with your build, it's incoherent to the rest of the build; i.e. the `INSTALLDIR_AUTOREPLACE` doesn't include it. Honestly I can't recall what the final effect of that was but the following [[patch]] fixed it. + +[[!format diff """ +diff --git a/Makefile.PL b/Makefile.PL +index 5b0eb74..94adb0f 100755 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -194,7 +194,7 @@ coverage: + WriteMakefile( + NAME => 'IkiWiki', + PREFIX => "/usr/local", +- PM_FILTER => './pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB)', ++ PM_FILTER => './pm_filter $(DESTDIR)$(PREFIX) $(VER) $(PROBABLE_INST_LIB)', + MAN1PODS => {}, + PREREQ_PM => { + 'XML::Simple' => "0", +"""]] + +Also, the `po/Makefile` presumes the use of `make`, explicitly. If you use another build tool it fails (ironically I was actually using `gmake` in non-gnu environment so it wasn't aliased to `make`). Switch from the explicit call to the generic recall variable `$(MAKE)`. + +[[!format diff """ +diff --git a/po/Makefile b/po/Makefile +index 5ec4a15..4d1d33e 100644 +--- a/po/Makefile ++++ b/po/Makefile +@@ -84,7 +84,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp + ../ikiwiki.out -libdir .. -setup underlay.setup -refresh + + ../ikiwiki.out: ../Makefile +- make -C .. ikiwiki.out ++ $(MAKE) -C .. ikiwiki.out + + ../Makefile: ../Makefile.PL + cd .. && ./Makefile.PL +"""]] + +Note following comments by [[Joey]] via github + +> These are not mergeable in their current state. +> +> *Pull 'DESTDIR' update to 'Makefile.PL' from mixed-master.* +> +> This doesn't explain +> +> * what the problem was +> * how the change fixed it +> * why the change is correct + +>> No, I suppose not; I won't explain. Hopefully the above clarifies. -- [[ttw]] + +> *Re-merge from 'joeyh' to new, clean head.* +> +> I have no idea what the above commit is doing, but it somehow makes changes to 432 files?! + +>> Yeah, sort of. I'm not very good with computers ... specifically, with `git` and stuff. The diff between my `master` and your `master` is only two files so hopefully it *is* actually doing what's intended (that is, those changes are from your repository into my own -- I "rebased" my own in an attempt to simplify things). Anyway. -- [[ttw]] + +> *Pull the 'po/Makefile' change from the mixed-master.* +> +> This one is adding a $(MAKE) where there was a make. Which is fine, but the commit message is again, horrible. What is the mixed-master? Describe the change you are making, not your internal process for making it. + +>> Note to others, `graft` from `hg` doesn't pull original commit messages the way you wish it did (or I did something wrong ... more likely). -- [[ttw]] + +> Also, please don't use github pull requests for ikiwiki. Post todo items on ikiwiki.info with a link to your git repository and branches to be merged. + +>> NP. [[http://github.com/ttw/ikiwiki]]; `master` branch. -- [[ttw]] -- cgit v1.2.3 From 867209a286fd807e2cf1d9338ffb43e367e7113f Mon Sep 17 00:00:00 2001 From: guest Date: Fri, 26 Dec 2014 08:29:36 -0400 Subject: --- doc/sandbox.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9aeb10deb..bfc1bf46a 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -19,6 +19,11 @@ pre formated text? > >> Without a space works too. >>> to three levels + + +Azerty +** Qsdf ** + > > Back to the first level. > -- cgit v1.2.3 From b87e46a76ddbddf77ddbeb765ec13b30ce8fb00b Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 16:55:12 -0500 Subject: Squelch "keys on reference is experimental". --- IkiWiki/Plugin/calendar.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm index 23246757b..c03b89667 100644 --- a/IkiWiki/Plugin/calendar.pm +++ b/IkiWiki/Plugin/calendar.pm @@ -115,7 +115,7 @@ sub build_affected { $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); ($ayear, $valid) = previousyear($year, $config{archivebase}); $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid); - foreach my $month (keys $changed{$year}) { + foreach my $month (keys %{$changed{$year}}) { ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase}); $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid); ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase}); -- cgit v1.2.3 From 6b7a2657ae69e6afd52ce58cf4f0b4190e75933b Mon Sep 17 00:00:00 2001 From: n0gOoi3 Date: Sun, 21 Dec 2014 14:45:50 +0000 Subject: Use $(MAKE) in po, as elsewhere in the build. (cherry picked from commit 26a6c611fe9a32efa437efd07c698116d22b3a31) --- po/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/Makefile b/po/Makefile index 5ec4a157c..4d1d33e83 100644 --- a/po/Makefile +++ b/po/Makefile @@ -84,7 +84,7 @@ underlays: ../ikiwiki.out underlays_copy_stamp ../ikiwiki.out -libdir .. -setup underlay.setup -refresh ../ikiwiki.out: ../Makefile - make -C .. ikiwiki.out + $(MAKE) -C .. ikiwiki.out ../Makefile: ../Makefile.PL cd .. && ./Makefile.PL -- cgit v1.2.3 From eacb0c3196953d8620de5e50a4a406a87d4d2553 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 17:28:28 -0500 Subject: Applied one patch, need more info for the other. --- ...er__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn index 4b84e56b5..0a80647c7 100644 --- a/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn +++ b/doc/todo/Add_DESTDIR_to_the___39__pm__95__filter__39___and_use_MAKE_in___39__po__47__Makefile__39__.mdwn @@ -16,6 +16,12 @@ index 5b0eb74..94adb0f 100755 'XML::Simple' => "0", """]] +> This change certainly looks plausible, but I maintain a package +> of ikiwiki in a build system that sets `DESTDIR`, and I've not +> noticed any problems there. Would you be willing to do one more +> build in your environment without this change, so that we can +> understand the problem it's trying to fix? --[[schmonz]] + Also, the `po/Makefile` presumes the use of `make`, explicitly. If you use another build tool it fails (ironically I was actually using `gmake` in non-gnu environment so it wasn't aliased to `make`). Switch from the explicit call to the generic recall variable `$(MAKE)`. [[!format diff """ @@ -34,6 +40,11 @@ index 5ec4a15..4d1d33e 100644 cd .. && ./Makefile.PL """]] +> This change looks more obviously correct, and I understand exactly +> I haven't encountered the problem you have (my build system ensures +> that `make` gets me `gmake` for ikiwiki). Cherry-picked, with amended +> commit message. --[[schmonz]] + Note following comments by [[Joey]] via github > These are not mergeable in their current state. -- cgit v1.2.3 From c668c2c7e248286e978e53cb89c9195dcf526ae4 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 17:32:20 -0500 Subject: Changelog the $(MAKE) patch. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 824a0061c..2a3f729c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium [ Amitai Schlair ] * core: log a debug message before waiting for the lock. Thanks, Mark Jason Dominus + * build: in po/Makefile, use the same $(MAKE) as the rest of the build. + Thanks, ttw -- Joey Hess Mon, 20 Oct 2014 12:04:49 -0400 -- cgit v1.2.3 From 47954c09ee9c200548824371a896da8bbda0443b Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 19:27:55 -0500 Subject: Accept comments on stdin (useful for importing). --- ikiwiki-comment.in | 92 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 31 deletions(-) diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in index b0cea4a4a..8f3db8988 100755 --- a/ikiwiki-comment.in +++ b/ikiwiki-comment.in @@ -9,44 +9,74 @@ sub usage () { die gettext("usage: ikiwiki-comment pagefile"), "\n"; } -my $pagefile=shift || usage (); +sub main { + my $pagefile=shift || usage (); + my $dir=get_dir($pagefile); + my $page=get_page($pagefile); -my $dir=IkiWiki::dirname($pagefile); -$dir="." unless length $dir; -my $page=IkiWiki::basename($pagefile); -if (! -d $pagefile) { - $page=~s/\.[^.]+$//; -} + IkiWiki::Plugin::comments::checkconfig(); + my $comment_num=1+IkiWiki::Plugin::comments::num_comments($page, $dir); -IkiWiki::Plugin::comments::checkconfig(); -my $comment_num=1 + IkiWiki::Plugin::comments::num_comments($page, $dir); + chomp(my $content = join('', )) unless -t STDIN; -my $username = getpwuid($<); -if (! defined $username) { $username="" } + my $comment=get_comment(get_username(), $comment_num, $content); -my $comment="[[!comment format=mdwn\n"; -$comment.=" username=\"$username\"\n"; -$comment.=" subject=\"\"\"comment $comment_num\"\"\"\n"; -$comment.=" " . IkiWiki::Plugin::comments::commentdate() . "\n"; -$comment.=" content=\"\"\"\n\n\"\"\"]]\n"; + # This will yield a hash of the comment before it's edited, + # but that's ok; the date provides sufficient entropy to avoid collisions, + # and the hash of a comment does not need to match its actual content. + # Doing it this way avoids needing to move the file to a final + # location after it's edited. + my $location=IkiWiki::Plugin::comments::unique_comment_location($page, $comment, $dir)."._comment"; -# This will yield a hash of the comment before it's edited, -# but that's ok; the date provides sufficient entropy to avoid collisions, -# and the hash of a comment does not need to match its actual content. -# Doing it this way avoids needing to move the file to a final -# location after it's edited. -my $location=IkiWiki::Plugin::comments::unique_comment_location($page, $comment, $dir)."._comment"; + IkiWiki::writefile($location, $dir, $comment); + exec_editor("$dir/$location") if -t STDIN; +} -IkiWiki::writefile($location, $dir, $comment); +sub get_dir { + my ($file) = @_; + my $dir=IkiWiki::dirname($file); + $dir="." unless length $dir; + return $dir; +} -my @editor="vi"; -if (-x "/usr/bin/editor") { - @editor="/usr/bin/editor"; +sub get_page { + my ($file) = @_; + my $page=IkiWiki::basename($file); + $page=~s/\.[^.]+$// unless -d $file; + return $page; } -if (exists $ENV{EDITOR}) { - @editor=split(' ', $ENV{EDITOR}); + +sub get_username { + my $username = getpwuid($<); + $username="" unless defined $username; + return $username; } -if (exists $ENV{VISUAL}) { -@editor=split(' ', $ENV{VISUAL}); + +sub get_comment { + my ($username, $comment_num, $content) = @_; + $content = '' unless defined $content; + my $comment="[[!comment format=mdwn\n"; + $comment.=" username=\"$username\"\n"; + $comment.=" subject=\"\"\"comment $comment_num\"\"\"\n"; + $comment.=" " . IkiWiki::Plugin::comments::commentdate() . "\n"; + $comment.=" content=\"\"\"\n$content\n\"\"\"]]\n"; + return $comment; } -exec(@editor, "$dir/$location"); + +sub exec_editor { + my ($file) = @_; + + my @editor="vi"; + if (-x "/usr/bin/editor") { + @editor="/usr/bin/editor"; + } + if (exists $ENV{EDITOR}) { + @editor=split(' ', $ENV{EDITOR}); + } + if (exists $ENV{VISUAL}) { + @editor=split(' ', $ENV{VISUAL}); + } + exec(@editor, $file); +} + +main(@ARGV); -- cgit v1.2.3 From 38a088a433d53eadfe1a457460fa7b702bdbe64c Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 22:27:12 -0500 Subject: ikiwiki-comment: optionally override parameters. --- IkiWiki/Plugin/comments.pm | 4 +-- ikiwiki-comment.in | 64 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 16 deletions(-) diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index d7666c852..ca497c75a 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -507,7 +507,7 @@ sub editcomment ($$) { $subject = "comment ".(num_comments($page, $config{srcdir}) + 1); } $content .= " subject=\"$subject\"\n"; - $content .= " " . commentdate() . "\n"; + $content .= " date=\"" . commentdate() . "\"\n"; my $editcontent = $form->field('editcontent'); $editcontent="" if ! defined $editcontent; @@ -636,7 +636,7 @@ sub editcomment ($$) { } sub commentdate () { - "date=\"" . strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime) . "\""; + strftime_utf8('%Y-%m-%dT%H:%M:%SZ', gmtime); } sub getavatar ($) { diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in index 8f3db8988..c742d7063 100755 --- a/ikiwiki-comment.in +++ b/ikiwiki-comment.in @@ -4,32 +4,54 @@ use strict; use lib '.'; # For use in nonstandard directory, munged by Makefile. use IkiWiki; use IkiWiki::Plugin::comments; +use Getopt::Long; -sub usage () { - die gettext("usage: ikiwiki-comment pagefile"), "\n"; +sub usage { + die gettext("usage: ikiwiki-comment pagefile [options]") . "\n"; } sub main { - my $pagefile=shift || usage (); + my $pagefile=shift || usage(); + my $interactive = -t STDIN; + my $content; + my ($format, $username, $subject, $date); + GetOptions( + 'format:s' => \$format, + 'username:s' => \$username, + 'subject:s' => \$subject, + 'date:s' => \$date, + ) || usage(); + my $dir=get_dir($pagefile); my $page=get_page($pagefile); IkiWiki::Plugin::comments::checkconfig(); - my $comment_num=1+IkiWiki::Plugin::comments::num_comments($page, $dir); - chomp(my $content = join('', )) unless -t STDIN; + if ($interactive) { + $format ||= 'mdwn'; + $username ||= get_username(); + $subject ||= get_subject($page, $dir); + $date ||= get_date(); + } else { + $format ||= undef; + die "must supply username" unless defined $username; + $subject ||= get_subject($page, $dir); + die "must supply date" unless defined $date; + chomp($content = join('', )); + } - my $comment=get_comment(get_username(), $comment_num, $content); + my $comment=get_comment($format, $username, $subject, $date, $content); - # This will yield a hash of the comment before it's edited, - # but that's ok; the date provides sufficient entropy to avoid collisions, - # and the hash of a comment does not need to match its actual content. + # For interactive use, this will yield a hash of the comment before + # it's edited, but that's ok; the date provides sufficient entropy + # to avoid collisions, and the hash of a comment does not need to + # match its actual content. # Doing it this way avoids needing to move the file to a final # location after it's edited. my $location=IkiWiki::Plugin::comments::unique_comment_location($page, $comment, $dir)."._comment"; IkiWiki::writefile($location, $dir, $comment); - exec_editor("$dir/$location") if -t STDIN; + exec_editor("$dir/$location") if $interactive; } sub get_dir { @@ -52,13 +74,27 @@ sub get_username { return $username; } +sub get_subject { + my ($page, $dir) = @_; + my $comment_num=1+IkiWiki::Plugin::comments::num_comments($page, $dir); + return "comment $comment_num"; +} + +sub get_date { + my $date = IkiWiki::Plugin::comments::commentdate(); + $date =~ s|^date=\\"||; + $date =~ s|\\"$||; + return $date; +} + sub get_comment { - my ($username, $comment_num, $content) = @_; + my ($format, $username, $subject, $date, $content) = @_; + $format = defined $format ? $format = " format=$format" : q{}; $content = '' unless defined $content; - my $comment="[[!comment format=mdwn\n"; + my $comment="[[!comment$format\n"; $comment.=" username=\"$username\"\n"; - $comment.=" subject=\"\"\"comment $comment_num\"\"\"\n"; - $comment.=" " . IkiWiki::Plugin::comments::commentdate() . "\n"; + $comment.=" subject=\"\"\"$subject\"\"\"\n"; + $comment.=" date=\"$date\"\n"; $comment.=" content=\"\"\"\n$content\n\"\"\"]]\n"; return $comment; } -- cgit v1.2.3 From c574e7b4220fb781030d42e80071fd6fab6a163a Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sat, 27 Dec 2014 22:45:27 -0500 Subject: Take advantage of having changed commentdate(). --- ikiwiki-comment.in | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in index c742d7063..eb22d6c0d 100755 --- a/ikiwiki-comment.in +++ b/ikiwiki-comment.in @@ -31,7 +31,7 @@ sub main { $format ||= 'mdwn'; $username ||= get_username(); $subject ||= get_subject($page, $dir); - $date ||= get_date(); + $date ||= IkiWiki::Plugin::comments::commentdate(); } else { $format ||= undef; die "must supply username" unless defined $username; @@ -80,13 +80,6 @@ sub get_subject { return "comment $comment_num"; } -sub get_date { - my $date = IkiWiki::Plugin::comments::commentdate(); - $date =~ s|^date=\\"||; - $date =~ s|\\"$||; - return $date; -} - sub get_comment { my ($format, $username, $subject, $date, $content) = @_; $format = defined $format ? $format = " format=$format" : q{}; -- cgit v1.2.3 From b435ddb8de2093d99aff4e50479c67ce03e4728a Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 28 Dec 2014 10:02:26 -0500 Subject: Optionally accept and emit comments' url/email/ip. --- ikiwiki-comment.in | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ikiwiki-comment.in b/ikiwiki-comment.in index eb22d6c0d..0891766ab 100755 --- a/ikiwiki-comment.in +++ b/ikiwiki-comment.in @@ -14,12 +14,15 @@ sub main { my $pagefile=shift || usage(); my $interactive = -t STDIN; my $content; - my ($format, $username, $subject, $date); + my ($format, $username, $subject, $date, $url, $email, $ip); GetOptions( 'format:s' => \$format, 'username:s' => \$username, 'subject:s' => \$subject, 'date:s' => \$date, + 'url:s' => \$url, + 'email:s' => \$email, + 'ip:s' => \$ip, ) || usage(); my $dir=get_dir($pagefile); @@ -32,15 +35,21 @@ sub main { $username ||= get_username(); $subject ||= get_subject($page, $dir); $date ||= IkiWiki::Plugin::comments::commentdate(); + $url ||= undef; + $email ||= undef; + $ip ||= undef; } else { $format ||= undef; die "must supply username" unless defined $username; $subject ||= get_subject($page, $dir); die "must supply date" unless defined $date; + $url ||= undef; + $email ||= undef; + $ip ||= undef; chomp($content = join('', )); } - my $comment=get_comment($format, $username, $subject, $date, $content); + my $comment=get_comment($format, $username, $subject, $date, $url, $email, $ip, $content); # For interactive use, this will yield a hash of the comment before # it's edited, but that's ok; the date provides sufficient entropy @@ -81,13 +90,16 @@ sub get_subject { } sub get_comment { - my ($format, $username, $subject, $date, $content) = @_; + my ($format, $username, $subject, $date, $url, $email, $ip, $content) = @_; $format = defined $format ? $format = " format=$format" : q{}; $content = '' unless defined $content; my $comment="[[!comment$format\n"; $comment.=" username=\"$username\"\n"; $comment.=" subject=\"\"\"$subject\"\"\"\n"; $comment.=" date=\"$date\"\n"; + $comment.=" url=\"$url\"\n" if defined $url; + $comment.=" email=\"$email\"\n" if defined $email; + $comment.=" ip=\"$ip\"\n" if defined $ip; $comment.=" content=\"\"\"\n$content\n\"\"\"]]\n"; return $comment; } -- cgit v1.2.3 From a87f43d71eccc6c71bd0dadcc1fe06ec809cfdcf Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 28 Dec 2014 13:15:45 -0500 Subject: Avoid uninitialized warnings with comments+no CGI. --- IkiWiki/Plugin/comments.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm index ca497c75a..1a50d1865 100644 --- a/IkiWiki/Plugin/comments.pm +++ b/IkiWiki/Plugin/comments.pm @@ -206,10 +206,12 @@ sub preprocess { $commentopenid = $commentuser; } else { - $commentauthorurl = IkiWiki::cgiurl( - do => 'goto', - page => IkiWiki::userpage($commentuser) - ); + if (length $config{cgiurl}) { + $commentauthorurl = IkiWiki::cgiurl( + do => 'goto', + page => IkiWiki::userpage($commentuser) + ); + } $commentauthor = $commentuser; } -- cgit v1.2.3