From: Joey Hess Date: Mon, 17 Dec 2007 18:37:19 +0000 (-0500) Subject: * Don't refuse to render files with ".." in their name. (Anchor the regexp.) X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/90bce7d13923769e0bee64d4a17d67c1df4c1aa9?ds=sidebyside * Don't refuse to render files with ".." in their name. (Anchor the regexp.) --- diff --git a/IkiWiki.pm b/IkiWiki.pm index 80750f502..a8703450c 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -32,7 +32,7 @@ memoize("file_pruned"); sub defaultconfig () { #{{{ return - wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./, + wiki_file_prune_regexps => [qr/^\.\.$/, qr/^\./, qr/\/\./, qr/\.x?html?$/, qr/\.ikiwiki-new$/, qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//, qr/(^|\/)_MTN\//, diff --git a/debian/changelog b/debian/changelog index 1708e7581..3d9f01207 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.16) unstable; urgency=low +ikiwiki (2.16) UNRELEASED; urgency=low * Major basewiki reorganisation. Most pages moved into ikiwiki/ subdirectory to avoid polluting the main namespace, and some were further renamed. @@ -58,6 +58,7 @@ ikiwiki (2.16) unstable; urgency=low * git: Correct display of multiline commit messages in recentchanges. * Re-organise dependencies and recommends now that recommends are installed by default. + * Don't refuse to render files with ".." in their name. (Anchor the regexp.) -- Joey Hess Sun, 16 Dec 2007 16:55:23 -0500 diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 6fe6fc7b6..e7f48d63e 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-16 16:55-0500\n" +"POT-Creation-Date: 2007-12-17 13:36-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -67,62 +67,62 @@ msgstr "" msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:70 +#: ../IkiWiki/Plugin/aggregate.pm:71 #, perl-format msgid "missing %s parameter" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:98 +#: ../IkiWiki/Plugin/aggregate.pm:99 msgid "new feed" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:112 +#: ../IkiWiki/Plugin/aggregate.pm:113 msgid "posts" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:114 +#: ../IkiWiki/Plugin/aggregate.pm:115 msgid "new" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:290 msgid "feed not found" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:306 msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:378 +#: ../IkiWiki/Plugin/aggregate.pm:379 #, perl-format msgid "creating new page %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index dd541c448..b1e62fe30 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,12 +1,12 @@ # Vietnamese translation for Iki Wiki. # Copyright © 2007 Free Software Foundation, Inc. # Clytie Siddall , 2007 -# +# msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-16 15:48-0500\n" +"POT-Creation-Date: 2007-12-17 13:32-0500\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -43,7 +43,7 @@ msgid "%s is not an editable page" msgstr "" #: ../IkiWiki/CGI.pm:441 ../IkiWiki/Plugin/brokenlinks.pm:24 -#: ../IkiWiki/Plugin/inline.pm:232 ../IkiWiki/Plugin/opendiscussion.pm:17 +#: ../IkiWiki/Plugin/inline.pm:234 ../IkiWiki/Plugin/opendiscussion.pm:17 #: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:98 #: ../IkiWiki/Render.pm:178 msgid "discussion" @@ -68,73 +68,73 @@ msgstr "Bạn bị cấm ra." msgid "login failed, perhaps you need to turn on cookies?" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:70 +#: ../IkiWiki/Plugin/aggregate.pm:71 #, fuzzy, perl-format msgid "missing %s parameter" msgstr "mẫu thiếu tham số id" -#: ../IkiWiki/Plugin/aggregate.pm:98 +#: ../IkiWiki/Plugin/aggregate.pm:99 msgid "new feed" msgstr "nguồn tin mới" -#: ../IkiWiki/Plugin/aggregate.pm:112 +#: ../IkiWiki/Plugin/aggregate.pm:113 msgid "posts" msgstr "bài" -#: ../IkiWiki/Plugin/aggregate.pm:114 +#: ../IkiWiki/Plugin/aggregate.pm:115 msgid "new" msgstr "mới" -#: ../IkiWiki/Plugin/aggregate.pm:231 +#: ../IkiWiki/Plugin/aggregate.pm:232 #, perl-format msgid "expiring %s (%s days old)" msgstr "đang mãn hạn %s (cũ %s ngày)" -#: ../IkiWiki/Plugin/aggregate.pm:238 +#: ../IkiWiki/Plugin/aggregate.pm:239 #, perl-format msgid "expiring %s" msgstr "đang mãn hạn %s" -#: ../IkiWiki/Plugin/aggregate.pm:264 +#: ../IkiWiki/Plugin/aggregate.pm:265 #, perl-format msgid "processed ok at %s" msgstr "đã xử lý được ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:269 +#: ../IkiWiki/Plugin/aggregate.pm:270 #, perl-format msgid "checking feed %s ..." msgstr "đang kiểm tra nguồn tin %s ..." -#: ../IkiWiki/Plugin/aggregate.pm:274 +#: ../IkiWiki/Plugin/aggregate.pm:275 #, perl-format msgid "could not find feed at %s" msgstr "không tìm thấy nguồn tin ở %s" -#: ../IkiWiki/Plugin/aggregate.pm:289 +#: ../IkiWiki/Plugin/aggregate.pm:290 #, fuzzy msgid "feed not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/aggregate.pm:300 +#: ../IkiWiki/Plugin/aggregate.pm:301 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:305 +#: ../IkiWiki/Plugin/aggregate.pm:306 msgid "feed crashed XML::Feed!" msgstr "nguồn tin đã gây ra XML::Feed sụp đổ." -#: ../IkiWiki/Plugin/aggregate.pm:378 +#: ../IkiWiki/Plugin/aggregate.pm:379 #, perl-format msgid "creating new page %s" msgstr "đang tạo trang mới %s" -#: ../IkiWiki/Plugin/brokenlinks.pm:37 +#: ../IkiWiki/Plugin/brokenlinks.pm:40 #, perl-format msgid "%s from %s" msgstr "" -#: ../IkiWiki/Plugin/brokenlinks.pm:44 +#: ../IkiWiki/Plugin/brokenlinks.pm:47 msgid "There are no broken links!" msgstr "Không có liên kết bị ngắt nào." @@ -205,28 +205,28 @@ msgstr "lỗi ghi %s: %s" #: ../IkiWiki/Plugin/inline.pm:42 msgid "Must specify url to wiki with --url when using --rss or --atom" msgstr "" -"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay " -"« --atom »" +"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --rss » hay « --" +"atom »" #: ../IkiWiki/Plugin/inline.pm:135 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki/Plugin/inline.pm:193 +#: ../IkiWiki/Plugin/inline.pm:195 msgid "Add a new post titled:" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:209 +#: ../IkiWiki/Plugin/inline.pm:211 #, perl-format msgid "nonexistant template %s" msgstr "" -#: ../IkiWiki/Plugin/inline.pm:240 ../IkiWiki/Render.pm:102 +#: ../IkiWiki/Plugin/inline.pm:242 ../IkiWiki/Render.pm:102 msgid "Discussion" msgstr "Thảo luận" -#: ../IkiWiki/Plugin/inline.pm:454 +#: ../IkiWiki/Plugin/inline.pm:456 msgid "RPC::XML::Client not found, not pinging" msgstr "Không tìm thấy RPC::XML::Client nên không gửi gói tin ping" @@ -661,8 +661,7 @@ msgstr "" #: ../IkiWiki.pm:129 msgid "Must specify url to wiki with --url when using --cgi" -msgstr "" -"Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" +msgstr "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" #: ../IkiWiki.pm:198 ../IkiWiki.pm:199 msgid "Error"