From: shizuki <shizuki@kinezumi.net>
Date: Tue, 1 May 2012 10:44:15 +0000 (+0900)
Subject: Merge branch 'skinnable-master' of ssh://shizuki@git.sourceforge.jp/gitroot/nucleus... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9814922d2228c33dc55c2e9822fd92dedfd14ef7;hp=116f919590277a62a09156429618a59be1c95c93;p=nucleus-jp%2Fnucleus-next.git

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

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 8759828..622d444 100644
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -1271,7 +1271,7 @@ class Actions extends BaseActions
 		
 		// create parser object & action handler
 		$handler = new ItemActions($blog);
-		$parser = new Parser($actions->getDefinedActions(),$handler);
+		$parser = new Parser($handler->getDefinedActions(),$handler);
 		$handler->setTemplate($template);
 		$handler->setParser($parser);
 		$item = Item::getitem($itemid, 0, 0);
@@ -2264,4 +2264,4 @@ class Actions extends BaseActions
 		$this->postBlogContent('sticky',$b);
 		return;
 	}
-}
+}
\ No newline at end of file
diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index 702b868..e8d1a49 100644
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@ -596,7 +596,7 @@ class Manager
 	public function addTicketToUrl($url)
 	{
 		$ticketCode = 'ticket=' . $this->_generateTicket();
-		if ( i18n::strpos($filename, '/') === FALSE )
+		if ( i18n::strpos($url, '?') === FALSE )
 		{
 			$ticketCode = "{$url}?{$ticketCode}";
 		}