From: Will Budic <redacted>
Date: Tue, 4 Feb 2020 03:16:12 +0000 (+1100)
Subject: bug 7 fix
X-Git-Url: https://lifelog.hopto.org/gitweb/?a=commitdiff_plain;h=f9b6c8b26337f004e2b888eeb388ad2430c1b16b;p=LifeLog.git

bug 7 fix
---

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 341e363..9159591 100755
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -615,7 +615,7 @@ qq(\n<img src="$lnk" width="$imgw" height="$imgh" class="tag_FRM"/>);
         }
 
         if ( $rtf > 0 ) {
-            $log .= qq(<hr><button id="btnRTF" onClick="return loadRTF(true, $id);">`RTF</button>);
+            $log .= qq(<hr><button id="btnRTF" onClick="return loadRTF(true, $id);">RTF</button>);
         }
 
         if($af==2){
diff --git a/htdocs/cgi-bin/wsrc/main.js b/htdocs/cgi-bin/wsrc/main.js
index 4cf0abb..4bbb0fd 100644
--- a/htdocs/cgi-bin/wsrc/main.js
+++ b/htdocs/cgi-bin/wsrc/main.js
@@ -285,7 +285,8 @@ function decodeToHTMLText(txt) {
 }
 
 function decodeToText(txt) {
-    txt = txt.replace(/`RTF$/, "");
+    //bug 7 fix
+    txt = txt.replace(/<hr>.*RTF<\/button>/gm, "");
     txt = txt.replace(/<br\s*[\/]?>/gi, "\n");
     return txt;
 }