Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus...

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 8759828..622d444 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -1271,7 +1271,7 @@ class Actions extends BaseActions
                \r
                // create parser object & action handler\r
                $handler = new ItemActions($blog);\r
-               $parser = new Parser($actions->getDefinedActions(),$handler);\r
+               $parser = new Parser($handler->getDefinedActions(),$handler);\r
                $handler->setTemplate($template);\r
                $handler->setParser($parser);\r
                $item = Item::getitem($itemid, 0, 0);\r
@@ -2264,4 +2264,4 @@ class Actions extends BaseActions
                $this->postBlogContent('sticky',$b);\r
                return;\r
        }\r
-}\r
+}
\ No newline at end of file

diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index 702b868..e8d1a49 100644 (file)
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@ -596,7 +596,7 @@ class Manager
        public function addTicketToUrl($url)\r
        {\r
                $ticketCode = 'ticket=' . $this->_generateTicket();\r
-               if ( i18n::strpos($filename, '/') === FALSE )\r
+               if ( i18n::strpos($url, '?') === FALSE )\r
                {\r
                        $ticketCode = "{$url}?{$ticketCode}";\r
                }\r