1
0
Fork 0
mirror of https://git.ludikovsky.name/git/fugitive.git synced 2024-05-18 22:45:31 +02:00

preventing from using of preprocessed article title

This commit is contained in:
Patrik Willard 2011-07-07 23:42:35 +02:00 committed by p4bl0
parent bcb998c65e
commit 9f158aef2b

View file

@ -190,7 +190,7 @@ replace_commit_info() {
} }
replace_article_info() { replace_article_info() {
article_title=`get_article_title "$1"` article_title="$2"
article_cdatetime=`get_article_info "%ai" "$1" | tail -1` article_cdatetime=`get_article_info "%ai" "$1" | tail -1`
article_cdatetime_html5=`echo "$article_cdatetime" | \ article_cdatetime_html5=`echo "$article_cdatetime" | \
sed "s/ /T/;s/ \(+\|-\)\([0-9][0-9]\)/\1\2:/"` sed "s/ /T/;s/ \(+\|-\)\([0-9][0-9]\)/\1\2:/"`
@ -285,18 +285,19 @@ replace_foreach () {
} }
generate_article() { generate_article() {
art="${1#$articles_dir/}"
article_title=`get_article_title "$art"`
if [ "$preproc" != "" ]; then if [ "$preproc" != "" ]; then
preproc_bak=`mktemp -p "$articles_dir"` preproc_bak=`mktemp -p "$articles_dir"`
mv "$1" "$preproc_bak" mv "$1" "$preproc_bak"
($preproc) < "$preproc_bak" > "$1" ($preproc) < "$preproc_bak" > "$1"
fi fi
art="${1#$articles_dir/}"
cat "$templates_dir/article.html" | \ cat "$templates_dir/article.html" | \
replace_includes | \ replace_includes | \
replace_str "page_title" "`get_article_title \"$art\"`" | \ replace_str "page_title" "$article_title" | \
replace_str "blog_url" "$blog_url" | \ replace_str "blog_url" "$blog_url" | \
replace_commit_info "-1" | \ replace_commit_info "-1" | \
replace_article_info "$art" | \ replace_article_info "$art" "$article_title" | \
sed "/^[[:space:]]*$/d" > "$public_dir/$art.html" sed "/^[[:space:]]*$/d" > "$public_dir/$art.html"
if [ "$preproc" != "" ]; then mv "$preproc_bak" "$1"; fi if [ "$preproc" != "" ]; then mv "$preproc_bak" "$1"; fi
} }