Surplus_Up (2DU) 5 лет назад
Родитель
Сommit
3175f39998
2 измененных файлов с 3 добавлено и 5 удалено
  1. 1 3
      route/tool/set_mark/namumark.py
  2. 2 2
      version.json

+ 1 - 3
route/tool/set_mark/namumark.py

@@ -1119,8 +1119,6 @@ def namumark(conn, data, title, include_num):
                             main_link.replace('\'', '\\\'') + "';" + \
                         "\n" + \
                     ""
-
-                
             else:
                 return_link = link_fix(main_link)
                 main_link = html.unescape(return_link[0])
@@ -1133,7 +1131,7 @@ def namumark(conn, data, title, include_num):
                 elif re.search(r'^\.\.\/', main_link):
                     main_link = re.sub(r'^\.\.\/', re.sub(r'(?P<in>.+)\/.*$', '\g<in>', title), main_link)
 
-                if main_link != title or main_link != '':
+                if main_link != title and main_link != '':
                     backlink += [[title, main_link, '']]
 
                     curs.execute(tool.db_change("select title from data where title = ?"), [main_link])

+ 2 - 2
version.json

@@ -1,10 +1,10 @@
 {
     "master" : {
-        "r_ver" : "v3.2.0-master-02",
+        "r_ver" : "v3.2.0-master-03",
         "c_ver" : "3193200",
         "s_ver" : "9"
     }, "stable" : {
-        "r_ver" : "v3.1.9-stable-02",
+        "r_ver" : "v3.2.0-stable-01",
         "c_ver" : "3193200",
         "s_ver" : "9"
     }