OSDN Git Service

applied some bug fixes
[nucleus-jp/nucleus-jp-ancient.git] / utf8 / nucleus / libs / globalfunctions.php
index e879dd5..9fd88fa 100755 (executable)
@@ -350,7 +350,7 @@ function sendContentType($contenttype, $pagetype = '', $charset = _CHARSET) {
 function startUpError($msg, $title) {\r
        ?>\r
        <html xmlns="http://www.w3.org/1999/xhtml">\r
-               <head><title><?php echo htmlspecialchars($title)?></title></head>\r
+               <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title><?php echo htmlspecialchars($title)?></title></head>\r
                <body>\r
                        <h1><?php echo htmlspecialchars($title)?></h1>\r
                        <?php echo $msg?>\r
@@ -577,13 +577,13 @@ function selector() {
 \r
                sscanf($archive,'%d-%d-%d',$y,$m,$d);\r
                if ($d != 0) {\r
-                       $archivetype = _ARCHIVETYPE_DAY;        // TODO: move to language file\r
+                       $archivetype = _ARCHIVETYPE_DAY;\r
                        $t = mktime(0,0,0,$m,$d,$y);\r
                        $archiveprev = strftime('%Y-%m-%d',$t - (24*60*60));\r
                        $archivenext = strftime('%Y-%m-%d',$t + (24*60*60));\r
 \r
                } else {\r
-                       $archivetype = _ARCHIVETYPE_MONTH; // TODO: move to language file\r
+                       $archivetype = _ARCHIVETYPE_MONTH;\r
                        $t = mktime(0,0,0,$m,1,$y);\r
                        $archiveprev = strftime('%Y-%m',$t - (1*24*60*60));\r
                        $archivenext = strftime('%Y-%m',$t + (32*24*60*60));\r
@@ -604,7 +604,7 @@ function selector() {
                if(preg_match("/^(\xA1{2}|\xe3\x80{2}|\x20)+$/",$query)){\r
                                        $type = 'index';\r
                }\r
-               $order = (_CHARSET == 'euc-jp') ? 'EUC-JP, UTF-8,' : 'UTF-8, EUC-JP,';\r
+               $order = (_CHARSET == 'EUC-JP') ? 'EUC-JP, UTF-8,' : 'UTF-8, EUC-JP,';\r
                $query = mb_convert_encoding($query, _CHARSET, $order.' JIS, SJIS, ASCII');\r
                if (intval($blogid)==0)\r
                        $blogid = getBlogIDFromName($blogid);\r