Merge branch 'master' into dependency-types

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 7348ea2f7757b420910d48c582364856ed817317..7b1d24c6a2214d14543aadcbbadde9767a15af52 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1810,9 +1810,7 @@ sub add_depends ($$;@) {
                        }
                }
        }
-       else {
-               $deptype=$DEPEND_CONTENT;
-       }
+       $deptype=$DEPEND_CONTENT unless $deptype;
 
        if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;