Merge branch 'master_zcl' into dev

# Conflicts: # Application/Admin/Common/function.php # Application/Admin/Controller/MemberController.class.php
5 years ago · 996b9bceac
parent 86fff37201 d265c9b03f
commit 996b9bceac
2 changed files with 2 additions and 4 deletions
--- a/Application/Admin/Common/function.php
+++ b/Application/Admin/Common/function.php
@ -586,7 +586,6 @@ function getAllGame()
    return $list;
 }

-
 /**
 * 中间加密 替换字符串的子串
 */
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@ -487,7 +487,6 @@ class MemberController extends ThinkController
        if (IS_POST) {
            $member = new MemberApi();
            $data = $_REQUEST;
-            unset($data['']);
            if (empty($data['password'])) {
                unset($data['password']);
            }