From 9f158aef2b3c577cfa9d7e26cc8a78ec0291c97b Mon Sep 17 00:00:00 2001
From: Patrik Willard <wildcard@padowi.se>
Date: Thu, 7 Jul 2011 23:42:35 +0200
Subject: preventing from using of preprocessed article title

---
 html-gen.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'html-gen.sh')

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