Merge branch dev/bug-63605 of zentao/zentaopms (#9895)

module/admin/model.php

@@ -202,11 +202,9 @@ class adminModel extends model
             {
                 list($module, $method, $params) = explode('|', $menu['link'] . '|');
                 $menu['link'] = helper::createLink($module, $method, $params);
-                if(common::hasPriv($module, $method)) $menu['disabled'] = false;
+                if(($this->app->user->admin || $module . $method != 'adminregister') && common::hasPriv($module, $method)) $menu['disabled'] = false;
             }
 
-            if(!$this->app->user->admin && $module . $method == 'adminregister') $menu['disabled'] = true;
-
             $order = $menu['order'];
             $orders[$order] = $menuKey;
 

module/admin/ui/register.html.php

@@ -13,12 +13,24 @@ namespace zin;
 jsVar('reSendText', $lang->admin->community->reSend);
 
 $checked = $agreeUX == 'true' ? 'checked' : '';
+
 if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false)
 {
+    set::zui(true);
+    $skip = div
+    (
+        a
+        (
+            setClass('btn capitalize skip-btn'),
+            $lang->admin->community->skip,
+            set::href(createLink('index')),
+        )
+    );
     $backBtn = '';
 }
 else
 {
+    $skip = '';
     $backBtn = div
     (
         setClass('page-title'),
@@ -33,23 +45,6 @@ else
     );
 }
 
-if(strpos($_SERVER['REQUEST_URI'], '_single=1') !== false)
-{
-    $skip = div
-    (
-        a
-        (
-            setClass('btn capitalize skip-btn'),
-            $lang->admin->community->skip,
-            set::href(createLink('user', 'login')),
-        )
-    );
-}
-else
-{
-    $skip = '';
-}
-
 $welcomeText = $bindCommunity ? $lang->admin->community->welcomeForBound : $lang->admin->community->welcome;
 
 $header[] = div