탑 메뉴 설정 버그 수정

route/tool/func.py

@@ -1156,10 +1156,15 @@ def wiki_set(num = 1):
         db_data = db_data[0][0] if db_data else ''
         db_data = db_data.replace('\r', '')
         
-        curs.execute(db_change("select data from user_set where name = '' and id = ?"), [ip])
+        curs.execute(db_change("select data from user_set where name = 'top_menu' and id = ?"), [ip])
         db_data_2 = curs.fetchall()
         db_data_2 = db_data_2[0][0] if db_data_2 else ''
-        db_data += db_data_2.replace('\r', '')
+        db_data_2 = db_data_2.replace('\r', '')
+        if db_data_2 != '' and db_data != '':
+            db_data += '\n' + db_data_2
+        elif db_data_2 != '':
+            db_data += db_data_2
+        
         if db_data != '':
             db_data = db_data.split('\n')
         

route/user_setting_top_menu.py

@@ -7,9 +7,12 @@ def user_setting_top_menu():
         ip = ip_check()
         if ban_check(ip) == 1:
             return re_error('/ban')
+
+        if ip_or_user(ip) == 1:
+            return redirect('/login')
         
         if flask.request.method == 'POST':
-            curs.execute(db_change("select name from other where name = 'top_menu'"))
+            curs.execute(db_change("select data from user_set where name = 'top_menu' and id = ?"), [ip])
             if curs.fetchall():
                 curs.execute(db_change("update user_set set data = ? where name = 'top_menu' and id = ?"), [flask.request.form.get('content', ''), ip])
             else:
@@ -17,7 +20,7 @@ def user_setting_top_menu():
 
             conn.commit()
 
-            return redirect('/setting/top_menu')
+            return redirect('/change/top_menu')
         else:
             curs.execute(db_change("select data from user_set where name = 'top_menu' and id = ?"), [ip])
             db_data = curs.fetchall()

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev31",
+        "r_ver" : "v3.4.6-RC5-dev32",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }