X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=ikiwiki-transition;h=599261a093d798f818942e90577ff07a86d09a44;hb=0314ed459ba1c49fad9170a54cc05f1c9e9c96bf;hp=b15d9f46b825a50ddd47bacff59ceb85c33edf2e;hpb=ffec6806087981420eaf83c8d83cc4523a46d0de;p=ikiwiki.git

diff --git a/ikiwiki-transition b/ikiwiki-transition
index b15d9f46b..599261a09 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -201,10 +201,15 @@ sub moveprefs {
 		foreach my $admin (@{$config{adminuser}}) {
 			my $a=IkiWiki::userinfo_get($admin, $field);
 			if (defined $a && length $a &&
-			    $a ne $orig && # might already have been moved
-			    defined $config{$field} &&
-			    length $config{$field}) {
-				 $config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+			    # might already have been moved
+			    (! defined $orig || $a ne $orig)) {
+			    	if (defined $config{$field} &&
+				    length $config{$field}) {
+					$config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+				}
+				else {
+					$config{$field}=$a;
+				}
 			}
 		}
 	}