Merge pull request #720 from 2du/master

버그 수정

route/tool/set_mark/namu.py

@@ -513,7 +513,7 @@ def namu(conn, data, title, main_num):
         
         backlink += [[title, main_link + other_link, 'redirect']]
         
-        data = redirect_re.sub('\n * ' + title + ' - [[' + main_link + other_link + ']]\n', data, 1)
+        data = redirect_re.sub('\n<ul><li>' + title + ' - <a href="' + tool.url_pas(main_link) + other_link + '">' + main_link + other_link + '</a></li></ul>\n', data, 1)
 
     no_toc_re = re.compile('\[(?:목차|toc)\((?:no)\)\]\n', re.I)
     toc_re = re.compile('\[(?:목차|toc)\]', re.I)

route/view_diff_data.py

@@ -6,7 +6,7 @@ def view_diff_data_2(conn, name):
     first = number_check(flask.request.args.get('first', '1'))
     second = number_check(flask.request.args.get('second', '1'))
 
-    curs.execute("select title from history where title = ? and id = ? or id = ? and hide = 'O'", [name, first, second])
+    curs.execute("select title from history where title = ? and (id = ? or id = ?) and hide = 'O'", [name, first, second])
     if curs.fetchall() and admin_check(6) != 1:
         return re_error('/error/3')
 

version.json

@@ -1,11 +1,11 @@
 {
     "master" : {
-        "r_ver" : "v3.1.2-stable-01",
+        "r_ver" : "v3.1.2-stable-02",
         "c_ver" : "400003",
         "s_ver" : "2"
     }, "stable" : {
-        "r_ver" : "v3.1.1-stable-04",
-        "c_ver" : "400001",
+        "r_ver" : "v3.1.2-stable-02",
+        "c_ver" : "400003",
         "s_ver" : "2"
     }
 }