FIX: call of special skin parts using fancy url scheme like special/specialname was...

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1151 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/libs/BaseActions.php b/utf8/nucleus/libs/BaseActions.php
index c0dbf7d..dd89f74 100644 (file)
--- a/utf8/nucleus/libs/BaseActions.php
+++ b/utf8/nucleus/libs/BaseActions.php
@@ -76,22 +76,15 @@ class BaseActions {
        function parse_parsedinclude($filename) {
                // check current level
                if ($this->level > 3) return;   // max. depth reached (avoid endless loop)
-               global $skinid;
-               $skin = new SKIN($skinid);
                $file = $this->getIncludeFileName($filename);
-               if (!$skin->isValid && !file_exists($file)) {
-                       return;
-               }
-               $contents = $skin->getContent($filename);
-               if (!$contents) {
-            if (!file_exists($file)) return;
-            $contents = file_get_contents($file);
-            if (empty($contents)) return;
-               }
+               if (!file_exists($file)) return;
+               $contents = file_get_contents($file);
+               if (empty($contents)) return;
+               
                $this->level = $this->level + 1;
                // parse file contents
                $this->parser->parse($contents);
-
+               
                $this->level = $this->level - 1;
        }
 

diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php
index 3a48f61..a8a7804 100755 (executable)
--- a/utf8/nucleus/libs/globalfunctions.php
+++ b/utf8/nucleus/libs/globalfunctions.php
@@ -565,6 +565,7 @@ if ($CONF['URLMode'] == 'pathinfo') {
 \r
                                        if ($i < sizeof($data) ) {\r
                                                $special = $data[$i];\r
+                                               $_REQUEST['special'] = $special;\r
                                        }\r
                                        break;\r
 \r