Merge branch 'stable' into master

route/setting.py

@@ -792,4 +792,4 @@ def setting_2(conn, num, db_set):
                 menu = [['setting', load_lang('return')]]
             ))
     else:
-        return redirect()
+        return redirect()

route/tool/set_mark/namumark.py

@@ -1330,4 +1330,4 @@ def namumark(conn, data, title, include_num):
     ''
     plus_data = 'render_html("' + include_name + 'render_contect");\n' + plus_data
 
-    return [data, plus_data, backlink]
+    return [data, plus_data, backlink]