Merge pull request #1909 from openNAMU/beta

버그 수정

route/bbs_w.py

@@ -25,7 +25,7 @@ def bbs_w(bbs_num = ''):
         temp_id = ''
         temp_dict = {}
 
-        curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where set_id = binary ? order by set_code + 0 desc'), [bbs_num])
+        curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where set_id like ? order by set_code + 0 desc'), [bbs_num])
         db_data = curs.fetchall()
         db_data = list(db_data) if db_data else []
 

route/recent_change.py

@@ -92,7 +92,7 @@ def recent_change(name = None, tool = ''):
                 set_type = '' if set_type == 'edit' else set_type
 
                 data_list = []
-                curs.execute(db_change('select title, id from rc where type = ? order by date desc'), [set_type])
+                curs.execute(db_change('select title, id from rc where type = ? order by date desc limit 50'), [set_type])
                 for i in curs.fetchall():
                     curs.execute(db_change('select id, title, date, ip, send, leng, hide from history where title = ? and id = ?'), i)
                     data_list += curs.fetchall()

route/tool/func.py

@@ -2134,15 +2134,17 @@ def ip_pas(raw_ip, type_data = 0):
         else:
             get_ip = raw_ip
 
+        admin_auth = admin_check(1)
+
         curs.execute(db_change("select data from other where name = 'ip_view'"))
         db_data = curs.fetchall()
         ip_view = db_data[0][0] if db_data else ''
-        ip_view = '' if admin_check(1) == 1 else ip_view
+        ip_view = '' if admin_auth == 1 else ip_view
 
         curs.execute(db_change("select data from other where name = 'user_name_view'"))
         db_data = curs.fetchall()
         user_name_view = db_data[0][0] if db_data else ''
-        user_name_view = '' if admin_check(1) == 1 else user_name_view
+        user_name_view = '' if admin_auth == 1 else user_name_view
         
         get_ip = list(set(get_ip))
         
@@ -2183,7 +2185,7 @@ def ip_pas(raw_ip, type_data = 0):
                 else:
                     curs.execute(db_change('select data from user_set where name = "user_name" and id = ?'), [raw_ip])
                     db_data = curs.fetchall()
-                    ip = db_data[0][0] if db_data else raw_ip
+                    ip = db_data[0][0] if db_data and db_data[0][0] != '' else raw_ip
                 
             if type_data == 0 and change_ip == 0:
                 if is_this_ip == 0:

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC4.2-dev231",
+        "r_ver" : "v3.4.6-RC4.3-dev233",
         "c_ver" : "3500365",
         "s_ver" : "3500111"
     }