FIX: グローバル設定において、管理画面用/ブックマークレット用スキン選択肢に「サイトの設定を使う」が含まれるバグ

コミット「a9efdd5a0b245be17da4d64c9b4e0384c9411eb0」の修正。グローバル設定においては必ず管理画面用/ブックマークレット用スキンが選択されている必要がある。

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index b9880e4..b1122d5 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1188,7 +1188,7 @@ class AdminActions extends BaseActions
        public function parse_defadminskinselect($template_name)
        {
                global $CONF, $action;
-
+               
                if ( $action == 'editmembersettings' )
                {
                        global $member;
@@ -1204,15 +1204,20 @@ class AdminActions extends BaseActions
                {
                        $default = $CONF['AdminSkin'];
                }
-
+               
                $query  = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%'";
                $query = sprintf($query, sql_table('skin_desc'));
                $template = array(
                                'name'          => 'adminskin',
                                'tabindex'      => 10080,
-                               'selected'      => $default,
-                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
+                               'selected'      => $default
                );
+               
+               if ( $this->skintype != 'settingsedit' )
+               {
+                       $template['extra'] = Entity::hsc(_MEMBERS_USESITELANG);
+               }
+               
                $this->parser->parse(showlist($query, 'select', $template, $template_name));
                return;
        }
@@ -1250,9 +1255,14 @@ class AdminActions extends BaseActions
                $template = array(
                                'name'          => 'bookmarklet',
                                'tabindex'      => 10085,
-                               'selected'      => $default,
-                               'extra'         => Entity::hsc(_MEMBERS_USESITELANG)
+                               'selected'      => $default
                );
+               
+               if ( $this->skintype != 'settingsedit' )
+               {
+                       $template['extra'] = Entity::hsc(_MEMBERS_USESITELANG);
+               }
+               
                $this->parser->parse(showlist($query, 'select', $template, $template_name));
                return;
        }