1.4.6: Note that this change does NOT mean the release of PukiWiki 1.4.6

[pukiwiki/pukiwiki.git] / lib / init.php

diff --git a/lib/init.php b/lib/init.php
index 4abaf0a..2d50aa9 100644 (file)
--- a/lib/init.php
+++ b/lib/init.php
@@ -1,12 +1,16 @@
 <?php
 // PukiWiki - Yet another WikiWikiWeb clone.
-// $Id: init.php,v 1.25 2005/01/31 15:04:21 henoheno Exp $
+// $Id: init.php,v 1.35 2005/07/18 13:52:59 henoheno Exp $
+// Copyright (C)
+//   2002-2005 PukiWiki Developers Team
+//   2001-2002 Originally written by yu-ji
+// License: GPL v2 or (at your option) any later version
 //
 // Init PukiWiki here
 
 // PukiWiki version / Copyright / Licence
 
-define('S_VERSION', '1.4.5');
+define('S_VERSION', '1.4.6');
 define('S_COPYRIGHT',
        '<strong>PukiWiki ' . S_VERSION . '</strong>' .
        ' Copyright &copy; 2001-2005' .
@@ -53,22 +57,43 @@ if ($die) die_message(nl2br("\n\n" . $die));
 /////////////////////////////////////////////////
 // INI_FILE: LANG ¤Ë´ð¤Å¤¯¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°ÀßÄê
 
+// CONTENT_CHARSET: Internal content encoding = Output content charset (for skin)
+//   'UTF-8', 'iso-8859-1', 'EUC-JP' or ...
+
+// MB_LANGUAGE: mb_language (for mbstring extension)
+//   'uni'(means UTF-8), 'English', or 'Japanese'
+
+// SOURCE_ENCODING: Internal content encoding (for mbstring extension)
+//   'UTF-8', 'ASCII', or 'EUC-JP'
+
 switch (LANG){
 case 'en':
-       // Internal content encoding = Output content charset (for skin)
-       define('CONTENT_CHARSET', 'iso-8859-1'); // 'UTF-8', 'iso-8859-1', 'EUC-JP' or ...
-       // mb_language (for mbstring extension)
-       define('MB_LANGUAGE',   'English');     // 'uni'(means UTF-8), 'English', or 'Japanese'
-       // Internal content encoding (for mbstring extension)
-       define('SOURCE_ENCODING', 'ASCII');     // 'UTF-8', 'ASCII', or 'EUC-JP'
+       // ASCII
+       define('CONTENT_CHARSET', 'iso-8859-1');
+       define('MB_LANGUAGE',     'English');
+       define('SOURCE_ENCODING', 'ASCII');
+
+       // UTF-8
+       //define('CONTENT_CHARSET', 'UTF-8');
+       //define('MB_LANGUAGE',     'English');
+       //define('SOURCE_ENCODING', 'UTF-8');
+
        break;
        
-case 'ja': // EUC-JP
+case 'ja':
+       // EUC-JP
        define('CONTENT_CHARSET', 'EUC-JP');
-       define('MB_LANGUAGE',   'Japanese');
+       define('MB_LANGUAGE',     'Japanese');
        define('SOURCE_ENCODING', 'EUC-JP');
        break;
 
+case 'ko':
+       // UTF-8 (See BugTrack2/13 for all hack about Korean support, and give us your report!)
+       define('CONTENT_CHARSET', 'UTF-8');
+       define('MB_LANGUAGE',     'Korean');
+       define('SOURCE_ENCODING', 'UTF-8');
+       break;
+
 default:
        die_message('No such language "' . LANG . '"');
 }
@@ -376,6 +401,10 @@ require(DATA_HOME . 'rules.ini.php');
 // ¸½ºß»þ¹ï
 $now = format_date(UTIME);
 
+// Æü»þÃÖ´¹¥ë¡¼¥ë¤ò$line_rules¤Ë²Ã¤¨¤ë
+if ($usedatetime) $line_rules += $datetime_rules;
+unset($datetime_rules);
+
 // ¥Õ¥§¥¤¥¹¥Þ¡¼¥¯¤ò$line_rules¤Ë²Ã¤¨¤ë
 if ($usefacemark) $line_rules += $facemark_rules;
 unset($facemark_rules);
@@ -387,8 +416,6 @@ $entity_pattern = trim(join('', file(CACHE_DIR . 'entities.dat')));
 $line_rules = array_merge(array(
        '&amp;(#[0-9]+|#x[0-9a-f]+|' . $entity_pattern . ');' => '&$1;',
        "\r"          => '<br />' . "\n",       /* ¹ÔËö¤Ë¥Á¥ë¥À¤Ï²þ¹Ô */
-       '#related$'   => '<del>#related</del>',
-       '^#contents$' => '<del>#contents</del>'
 ), $line_rules);
 
 ?>