new wishlist item, patch included

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index b15d9f46b825a50ddd47bacff59ceb85c33edf2e..599261a093d798f818942e90577ff07a86d09a44 100755 (executable)
--- 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 &&
                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;
+                               }

                        }
                }
        }
                        }
                }
        }