From 9aed5701d31fd51e85f3acd5fc7c45e6d93927ce Mon Sep 17 00:00:00 2001
From: sakamocchi
Date: Wed, 19 Jan 2011 08:30:49 +0000
Subject: [PATCH] Fix PDO switch problem and nclude UTF-8 multibyte processing.
git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1090 1ca29b6e-896d-4ea0-84a5-967f57386b96
---
utf8/install/index.php | 6 +++++-
utf8/install/install.sql | 5 ++++-
utf8/install/install_lang_japanese.php | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/utf8/install/index.php b/utf8/install/index.php
index 16df611..e3a4a9a 100755
--- a/utf8/install/index.php
+++ b/utf8/install/index.php
@@ -841,7 +841,7 @@ function doInstall() {
$config_data .= " \$MYSQL_DATABASE = '" . $mysql_database . "';\n";
$config_data .= " \$MYSQL_PREFIX = '" . (($mysql_usePrefix == 1) ? $mysql_prefix : '') . "';\n";
$config_data .= " // new in 3.50. first element is db handler, the second is the db driver used by the handler\n";
- $config_data .= " // default is \$MYSQL_HANDLER = array('mysql','mysql');\n";
+ $config_data .= " // default is \$MYSQL_HANDLER = array('mysql','');\n";
$config_data .= " //\$MYSQL_HANDLER = array('mysql','mysql');\n";
$config_data .= " //\$MYSQL_HANDLER = array('pdo','mysql');\n";
$config_data .= " \$MYSQL_HANDLER = array('".$MYSQL_HANDLER[0]."','".$MYSQL_HANDLER[1]."');\n";
@@ -908,6 +908,10 @@ function doInstall() {
$MYSQL_DATABASE = '';
$MYSQL_PREFIX = '';
+ // new in 3.50. first element is db handler, the second is the db driver used by the handler
+ // default is $MYSQL_HANDLER = array('mysql','');
+ $MYSQL_HANDLER = array('','');
+
// main nucleus directory
$DIR_NUCLEUS = '';
diff --git a/utf8/install/install.sql b/utf8/install/install.sql
index b853974..02fdfbf 100755
--- a/utf8/install/install.sql
+++ b/utf8/install/install.sql
@@ -133,7 +133,7 @@ INSERT INTO `nucleus_config` (`name`, `value`) VALUES
('DatabaseVersion', '350'),
('DebugVars', '0'),
('DefaultListSize', '10'),
- ('AdminCSS', 'original');
+ ('AdminCSS', 'contemporary_jp');
CREATE TABLE `nucleus_item` (
`inumber` int(11) NOT NULL auto_increment,
@@ -151,6 +151,9 @@ CREATE TABLE `nucleus_item` (
`iposted` tinyint(2) NOT NULL default '1',
PRIMARY KEY (`inumber`),
KEY `itime` (`itime`),
+ INDEX `iblog` (`iblog`),
+ INDEX `idraft` (`idraft`),
+ INDEX `icat` (`icat`),
FULLTEXT KEY `ibody` (`ibody`, `ititle`, `imore`)
) TYPE=MyISAM PACK_KEYS=0;
diff --git a/utf8/install/install_lang_japanese.php b/utf8/install/install_lang_japanese.php
index a6b11e5..9793b99 100644
--- a/utf8/install/install_lang_japanese.php
+++ b/utf8/install/install_lang_japanese.php
@@ -73,7 +73,7 @@ define('_TEXT2_WARN2', ' 注æ: Nucleusã®åä½ã«ã¯å°ãªãã¨ããã¼
define('_TEXT2_WARN3', 'è¦åï¼ åä½ãã¦ããPHPã®ãã¼ã¸ã§ã³ãå¤ãããã§ãï¼æ¬¡ã«ãªãªã¼ã¹ãããNucleusCMSã§ã¯PHP4ã¯ãµãã¼ãããã¾ããï¼æ©æ¥ã«PHP5ã«ã¢ããã°ã¬ã¼ããã¦ãã ããï¼');
define('_HEADER3', 'config.phpã®èªåè¨å®');
-define('_TEXT3', 'config.phpã¸ã®æ¸ãè¾¼ã¿ãã§ãã¾ãããconfig.phpã®ãã¼ããã·ã§ã³ã666ã«ãã¦ããã°ãã¹ã¯ãªãããèªåã§è¨å®æ
å ±ãæ¸ãè¾¼ã¿ã¾ãããã ããNucleusã®ã¤ã³ã¹ãã¼ã«å®äºå¾ãå¿
ããã¼ããã·ã§ã³ã444ã«å¤æ´ãã¦ãã ãã(ãã¼ããã·ã§ã³å¤æ´ã®ç°¡æã¬ã¤ã)ã
');
+define('_TEXT3', 'config.phpã¸ã®æ¸ãè¾¼ã¿ãã§ãã¾ãããconfig.phpã®ãã¼ããã·ã§ã³ã666ã«ãã¦ããã°ãã¹ã¯ãªãããèªåã§è¨å®æ
å ±ãæ¸ãè¾¼ã¿ã¾ãããã ããNucleusã®ã¤ã³ã¹ãã¼ã«å®äºå¾ãå¿
ããã¼ããã·ã§ã³ã444ã«å¤æ´ãã¦ãã ãã(ãã¼ããã·ã§ã³å¤æ´ã®ç°¡æã¬ã¤ã)ã');
define('_HEADER4', 'MySQLã®ãã°ã¤ã³æ
å ±');
define('_TEXT4', 'ãã¼ã¿ãã¼ã¹ã®ãã°ã¤ã³æ
å ±ãå
¥åãã¦ãã ããããã®æ
å ±ãåãããªãå ´åã¯ãã·ã¹ãã 管çè
ããã¹ãã£ã³ã°å
ã«ç¢ºèªãã¨ã£ã¦ãã ãããã»ã¨ãã©ã®å ´åããã¹ãåã¯ï½¢localhostï½£ã§ããããNucleusãããªãã®ãµã¼ãã®PHPè¨å®ããï½¢default MySQL hostï½£ãæ¤åºãã¦ããã°ï½¢ãã¹ãåï½£ã«æ¢ã«è¨å
¥ããã¦ããã¯ãã§ããããã®æ
å ±ãæ£ç¢ºã§ããã¨ããä¿è¨¼ã¯ããã¾ããã
');
@@ -137,7 +137,7 @@ define('_TEXT9', 'ä¸ã«æ¸ãã¦ãããã¼ã¿ãæ£ããã確ãã
define('_TEXT10', '
ãã¼ã¿ãã¼ã¹ãã¼ãã«ã®åæå¤å
¥åãæåãã¾ãããå¾ã¯config.phpãæ¸ãæããã ãã§ãã以ä¸ã«æ¸ãæããã¹ãå
容ã表示ãã¾ãï¼mysqlã®ãã¹ã¯ã¼ãã¯ãã¹ã¯ããã¦ãã¾ããããã¯å®éã®ãã®ã«æ¸ãæãã¦ãã ããï¼
');
define('_TEXT11', 'ããªãã®ã³ã³ãã¥ã¼ã¿ä¸ã®ãã¡ã¤ã«ãæ¸ãæããããFTPã使ã£ã¦ã¦ã§ããµã¼ãã«ã¢ãããã¼ããã¦ãã ãããASCIIã¢ã¼ãã§éä¿¡ãã¦ãã¡ã¤ã«ãä¸æ¸ããã¾ãã
');
define('_TEXT12', 'ä»è¨: config.phpã®æåãçµããã«ã¹ãã¼ã¹ã空ããªãããã«ãã¾ããããå®è¡æã«ã¨ã©ã¼ãå¼ãèµ·ããåå ã¨ãªãã¾ãã
ãããã£ã¦ãconfig.phpã®æåã®æå㯠"<"ã§æå¾ã®æåã¯">"ã¨ããªããã°ãªãã¾ããã');
-define('_TEXT13', 'Nucleusã¯ã¤ã³ã¹ãã¼ã«ãããconfig.php
ã¯ã¢ãããã¼ãããã¾ããã
ã»ãã¥ãªãã£ã®ããconfig.php
ã®ãã¼ããã·ã§ã³ã444ã«æ»ããã¨ãå¿ããªãã§ãã ãã(ãã¼ããã·ã§ã³å¤æ´ã®ç°¡æã¬ã¤ã)ã
');
+define('_TEXT13', 'Nucleusã¯ã¤ã³ã¹ãã¼ã«ãããconfig.php
ã¯ã¢ãããã¼ãããã¾ããã
ã»ãã¥ãªãã£ã®ããconfig.php
ã®ãã¼ããã·ã§ã³ã444ã«æ»ããã¨ãå¿ããªãã§ãã ãã(ãã¼ããã·ã§ã³å¤æ´ã®ç°¡æã¬ã¤ã)ã
');
define('_TEXT14', 'Nucleusã¯èª°ã§ãããã°ã«ã³ã¡ã³ããæ®ããã¨ãã§ããæ§ã«ãªã£ã¦ããã®ã§ããã®ã¾ã¾ã§ã¯ã¹ãã ã®æ¸©åºã«ãªãå±éºãããã¾ãã以ä¸ã®æ¹æ³ã«ãã£ã¦ããã°ãä¿è·ãããã¨ããå§ããã¾ãï¼
');
define('_TEXT14_L1', 'ããªããã³ã¡ã³ããå¿
è¦ã¨ããªãã®ã§ããã°ã管çã¨ãªã¢ããï½¢ããªãã®ããã°ï½£ > ï½¢ããã°è¨å®ï½£ ã¨ãã©ãã ï½¢ã³ã¡ã³ãã許å¯ãã¾ãã?ï½£ ã®è¨å®ãï½¢ãããï½£ã«ãããã¨ã§ãã³ã¡ã³ãæ稿ãã©ã¼ã ãé表示ã«ãããã¨ãã§ãã¾ãã');
define('_TEXT14_L2', 'ã¹ãã ãæéã»ç®¡çããçºã®ãã©ã°ã¤ã³ãã¤ã³ã¹ãã¼ã«ãããã¨ãå¯è½ã§ãï¼Nucleus Japan wiki (ããã¯ãã¼ã¯ããå§ããã¾ã)');
--
2.11.0