MERGE: リビジョン1764のマージ。Skinクラスのコードの少々の整理

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

diff --git a/nucleus/libs/SKIN.php b/nucleus/libs/SKIN.php
index 38a1e9d..80424ae 100644 (file)
--- a/nucleus/libs/SKIN.php
+++ b/nucleus/libs/SKIN.php
@@ -348,8 +348,6 @@ class Skin
                        }
                }
                
-               $actions = $this->getAllowedActionsForType($type);
-               
                $manager->notify("Pre{$this->event_identifier}Parse", array('skin' => &$this, 'type' => $type, 'contents' => &$contents));
                
                // set IncludeMode properties of parser
@@ -359,7 +357,9 @@ class Skin
                $action_class = $this->action_class;
                $handler = new $action_class($type);
                
+               $actions = $handler->getDefinedActions($type);
                $parser = new Parser($actions, $handler);
+               
                $handler->setParser($parser);
                $handler->setSkin($this);
                $parser->parse($contents);