Merge branch 'master' into dependency-types

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 78592e6ad2dcd6f8d5db3ebd1086ab5b34a213a4..7b1d24c6a2214d14543aadcbbadde9767a15af52 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,7 +1536,7 @@ sub loadindex () {
                                };
                        }
                        elsif (exists $d->{depends_simple}) {
-                               $depends{$page}=$d->{depends_simple};
+                               $depends_simple{$page}=$d->{depends_simple};
                        }
                        if (exists $d->{dependslist}) {
                                # old format
@@ -1810,9 +1810,7 @@ sub add_depends ($$;@) {
                        }
                }
        }
-       else {
-               $deptype=$DEPEND_CONTENT;
-       }
+       $deptype=$DEPEND_CONTENT unless $deptype;
 
        if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;