MERGE: リビジョン1796。多言語化処理の観点からstrstr()をi18n::strpos()に変更

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

diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index 9787cf1..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
@@ -736,7 +736,7 @@ class Manager
                                \r
                                // add in database as non-active\r
                                $query = "INSERT INTO %s (ticket, member, ctime)"\r
-                                      . " VALUES ('%s', %d, '%d');";\r
+                                      . " VALUES ('%s', %d, '%s');";\r
                                $query = sprintf($query, sql_table('tickets'), sql_real_escape_string($ticket), (integer) $memberId, date('Y-m-d H:i:s',time()));\r
                                \r
                                if ( sql_query($query) )\r