CHANGE: Admin::skinieimport()とAdmin::skiniedoimport()からAdminActionsに変数を渡す方法

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

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 9a998bb..0e1f31a 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -5438,20 +5438,20 @@ class Admin
                        return $error;\r
                }\r
                \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']   = $importer->getInfo();\r
-               $_REQUEST['skinnames']  = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames']  = $importer->getTemplateNames();\r
+               Admin::$contents['mode']                = $mode;\r
+               Admin::$contents['skinfile']    = $skinFileRaw;\r
+               Admin::$contents['skininfo']    = $importer->getInfo();\r
+               Admin::$contents['skinnames']   = $importer->getSkinNames();\r
+               Admin::$contents['tpltnames']   = $importer->getTemplateNames();\r
                \r
                // clashes\r
                $skinNameClashes                = $importer->checkSkinNameClashes();\r
                $templateNameClashes    = $importer->checkTemplateNameClashes();\r
                $hasNameClashes                 = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);\r
                \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skinclashes'] = $skinNameClashes;\r
-               $_REQUEST['tpltclashes'] = $templateNameClashes;\r
-               $_REQUEST['nameclashes'] = $hasNameClashes ? 1 : 0;\r
+               Admin::$contents['skinclashes'] = $skinNameClashes;\r
+               Admin::$contents['tpltclashes'] = $templateNameClashes;\r
+               Admin::$contents['nameclashes'] = $hasNameClashes ? 1 : 0;\r
                \r
                unset($importer);\r
                return '';\r
@@ -5498,10 +5498,11 @@ class Admin
                        return $error;\r
                }\r
                \r
-               /* TODO: we should consider to use the other way insterad of this */\r
-               $_REQUEST['skininfo']  = $importer->getInfo();\r
-               $_REQUEST['skinnames'] = $importer->getSkinNames();\r
-               $_REQUEST['tpltnames'] = $importer->getTemplateNames();\r
+               Admin::$contents['mode']                = $mode;\r
+               Admin::$contents['skinfile']    = $skinFileRaw;\r
+               Admin::$contents['skininfo']    = $importer->getInfo();\r
+               Admin::$contents['skinnames']   = $importer->getSkinNames();\r
+               Admin::$contents['tpltnames']   = $importer->getTemplateNames();\r
                \r
                unset($importer);\r
                return '';\r