MERGE: リビジョン1851。alertOnHeadersSentとalertOnSecurityRiskの初期化条件の変更

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

diff --git a/nucleus/libs/BaseActions.php b/nucleus/libs/BaseActions.php
index 7261ff3..673bd26 100644 (file)
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@ -183,10 +183,10 @@ class BaseActions
         * BaseActions::parse_parsedinclude()
         * parsed include
         * 
-        * @param       string  $filename       filename to be included
+        * @param       string  $name   filename to be included
         * @return      void
         */
-       public function parse_parsedinclude($filename)
+       public function parse_parsedinclude($name)
        {
                // check current level
                if ( $this->level > 3 )
@@ -195,14 +195,15 @@ class BaseActions
                        return;
                }
                
-               $file = $this->getIncludeFileName($filename);
-               
-               if ( !file_exists($file) )
+               $file = $this->getIncludeFileName($name);
+               if ( !file_exists($file) && $this->parser->skin != NULL)
                {
-                       return;
+                       $contents = $this->parser->skin->getContentFromDB($name);
+               }
+               else
+               {
+                       $contents = file_get_contents($file);
                }
-               
-               $contents = file_get_contents($file);
                
                if ( empty($contents) )
                {
@@ -290,11 +291,11 @@ class BaseActions
        {
                if ( !defined($constant) )
                {
-                       echo Entity::hsc($constant);
+                       echo $constant;
                }
                else
                {
-                       echo Entity::hsc(constant($constant));
+                       echo constant($constant);
                }
                return;
        }