토론 파싱 버그 수정

route/api_topic_sub.py

@@ -54,13 +54,15 @@ def api_topic_sub_2(conn, name, sub, time):
                     
                 if flask.request.args.get('top', None):
                     t_color = 'toron_color_red'
-                elif i[3] == s_user:
+                elif i[3] == s_user and i[5] != '1':
                     t_color = 'toron_color_green'
                 elif i[5] == '1':
                     t_color = 'toron_color_blue'
                 else:
                     t_color = 'toron_color'
 
+                print(i[5])
+
                 if admin == 1 or b_color != 'toron_color_not':
                     ip += ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/admin/' + i[0] + '">(' + load_lang('discussion_tool') + ')</a>'
                     

route/tool/set_mark/namu.py

@@ -1023,7 +1023,9 @@ def namu(conn, data, title, main_num, include_num):
     footnote_dict = {}
     footnote_re = {}
     
-    footdata_all = '</div><hr><ul id="footnote_data">'
+    footdata_all = '<hr><ul id="footnote_data">'
+
+    print(data)
     
     re_footnote = re.compile('(?:\[\*((?:(?! |\]).)*)(?: ((?:(?!(?:\[\*|\])).)+))?\]|(\[(?:각주|footnote)\]))')
     while 1:
@@ -1103,6 +1105,7 @@ def namu(conn, data, title, main_num, include_num):
         else:
             break
 
+    print(data)
     data = re.sub('\n+$', '', data)
 
     footnote_all.sort()
@@ -1124,6 +1127,7 @@ def namu(conn, data, title, main_num, include_num):
         ''
 
     footdata_all += '</ul>'
+    footdata_all = '</div>' + footdata_all
     if footdata_all == '</div><hr><ul id="footnote_data"></ul>':
         footdata_all = '</div>'
 

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-09",
+        "r_ver" : "v3.1.5-master-10",
         "c_ver" : "400004",
         "s_ver" : "5"
     }, "stable" : {