CHANGE: Adminクラスのスキン関係メソッドの整理・統合

[nucleus-jp/nucleus-next.git] / nucleus / libs / AdminActions.php

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 4977d78..c3f2da1 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1974,7 +1974,7 @@ class AdminActions extends BaseActions
                }
                
                $template['tabindex'] = 10;
-               $template['skinid'] = $skin->getID();
+               $template['skinid'] = intRequestVar('skinid');
                $template['skinname'] = $skin->getName();
                $this->parser->parse(showlist($normal_skintype, 'list_normalskinlist', $template, $template_name));
                
@@ -4033,7 +4033,7 @@ class AdminActions extends BaseActions
                {
                        include_libs('skinie.php');
                }
-
+               
                if ( !preg_match('#^admin#', $this->skintype) && $this->skintype != 'importAdmin' )
                {
                        $skindir = $DIR_SKINS;
@@ -4046,8 +4046,15 @@ class AdminActions extends BaseActions
                $candidates = SkinImport::searchForCandidates($skindir);
                foreach ( $candidates as $skinname => $skinfile )
                {
-                       $skinfile = Entity::hsc($skinfile);
                        $skinname = Entity::hsc($skinname);
+                       if ( !preg_match('#^admin#', $this->skintype) && $this->skintype != 'importAdmin' )
+                       {
+                               $skinfile = Entity::hsc($skinfile);
+                       }
+                       else
+                       {
+                               $skinfile = Entity::hsc("admin/$skinfile");
+                       }
                        echo "<option value=\"{$skinfile}\">{$skinname}</option>\n";
                }