diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-21 19:47:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-21 19:47:38 -0400 |
| commit | 789e68a8b1a451133d9308ecd800140e2ed6f626 (patch) | |
| tree | 752f955bd5dd421891ec423ebabef07a8712cc5b /IkiWiki.pm | |
| parent | 8cde2365e43f1c96432dcedb378be55d2308dd08 (diff) | |
| parent | 77779dc4a09a9b686935e8e615cf2502f7125bb4 (diff) | |
Merge branch 'master' into autotag
Conflicts:
IkiWiki/Plugin/tag.pm
Diffstat (limited to 'IkiWiki.pm')
| -rw-r--r-- | IkiWiki.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index 5355b838d..dbf50feb4 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2255,7 +2255,7 @@ sub derel ($$) { if ($path =~ m!^\./!) { $from=~s#/?[^/]+$## if defined $from; $path=~s#^\./##; - $path="$from/$path" if length $from; + $path="$from/$path" if defined $from && length $from; } return $path; |