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

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

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