Merge commit 'origin/master' into aggregateinternal

1 files changed, 8 insertions, 4 deletions

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c241fd40b..990fcaaa1 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -229,10 +229,14 @@ sub render ($) { #{{{
 		will_render($file, $file, 1);
 		
 		if ($config{hardlink}) {
-			prep_writefile($file, $config{destdir});
-			unlink($config{destdir}."/".$file);
-			if (link($srcfile, $config{destdir}."/".$file)) {
-				return;
+			# only hardlink if owned by same user
+			my @stat=stat($srcfile);
+			if ($stat[4] == $>) {
+				prep_writefile($file, $config{destdir});
+				unlink($config{destdir}."/".$file);
+				if (link($srcfile, $config{destdir}."/".$file)) {
+					return;
+				}
 			}
 			# if hardlink fails, fall back to copying
 		}