FIX:グローバル設定に準じている管理エリア・ブックマークレットのスキン設定を-サイトの設定を使う -と表示するように修正

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 69d816a..784f473 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1192,13 +1192,13 @@ class AdminActions extends BaseActions
                if ( $action == 'editmembersettings' )
                {
                        global $member;
-                       $default = ($member->adminskin > 0) ? $member->adminskin : $CONF['AdminSkin'];
+                       $default = $member->adminskin;
                }
                elseif ( $action == 'memberedit' )
                {
                        global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
-                       $default = ($mem->adminskin > 0) ? $mem->adminskin : $CONF['AdminSkin'];
+                       $default = $mem->adminskin;
                }
                else
                {
@@ -1210,7 +1210,8 @@ class AdminActions extends BaseActions
                $template = array(
                                'name'          => 'adminskin',
                                'tabindex'      => 10080,
-                               'selected'      => $default
+                               'selected'      => $default,
+                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
                );
                $this->parser->parse(showlist($query, 'select', $template, $template_name));
                return;
@@ -1230,13 +1231,13 @@ class AdminActions extends BaseActions
                if ( $action == 'editmembersettings' )
                {
                        global $member;
-                       $default = ($member->bookmarklet > 0) ? $member->bookmarklet : $CONF['BookmarkletSkin'];
+                       $default = $member->bookmarklet;
                }
                elseif ( $action == 'memberedit' )
                {
                        global $manager;
                        $mem = $manager->getMember(intRequestVar('memberid'));
-                       $default = ($mem->bookmarklet > 0) ? $mem->bookmarklet : $CONF['BookmarkletSkin'];
+                       $default = $mem->bookmarklet;
                }
                else
                {
@@ -1249,7 +1250,8 @@ class AdminActions extends BaseActions
                $template = array(
                                'name'          => 'bookmarklet',
                                'tabindex'      => 10085,
-                               'selected'      => $default
+                               'selected'      => $default,
+                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
                );
                $this->parser->parse(showlist($query, 'select', $template, $template_name));
                return;